commit e5e54725d9e3245c7d811608f099c54b29e6ce57
author Mikaël Peltier <mikaelpeltier@google.com> Fri Aug 18 12:01:59 2017 +0200
committer Mikaël Peltier <mikaelpeltier@google.com> Fri Aug 18 12:01:59 2017 +0200
tree 974c72444f1497163ea80001cb5fddcbafa402ec
parent 7e81006803f88ab4e40d9811952c7fc1c5658f4b

Repackage all embedded libraries of R8

Bug: 64100567
Change-Id: Iefa82fcf74b4cf096335d2fba47c60f94e841221

build.gradle

diff --git a/build.gradle b/build.gradle
index 7a007d4..f497f2e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -315,17 +315,25 @@
     options.compilerArgs = ['-Xlint:none']
 }
 
-task R8(type: Jar) {
+task R8(type: com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
     from sourceSets.main.output
     baseName 'r8'
+    classifier = null
+    version = null
     manifest {
         attributes 'Main-Class': 'com.android.tools.r8.R8'
     }
     // In order to build without dependencies, pass the exclude_deps property using:
     // gradle -Pexclude_deps R8
     if (!project.hasProperty('exclude_deps')) {
+        // Relocating dependencies to avoid conflicts.
+        relocate 'com.google', 'com.android.tools.r8.com.google'
+        relocate 'joptsimple', 'com.android.tools.r8.joptsimple'
+        relocate 'org', 'com.android.tools.r8.org'
+        relocate 'it.unimi.dsi.fastutil', 'com.android.tools.r8.it.unimi.dsi.fastutil'
+        relocate 'junit', 'com.android.tools.r8.junit'
         // Also include dependencies
-        from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
+        configurations = [project.configurations.compile]
     }
 }