commit 809393113641616273671dd549e28b89e97a806a
author mikaelpeltier <mikaelpeltier@google.com> Thu Aug 17 15:00:09 2017 +0200
committer Mikael Peltier <mikaelpeltier@google.com> Thu Aug 17 13:03:48 2017 +0000
tree 8a03151da45f781e0bdd25868fc15b6ff45d079e
parent 3d77004fab3933b3931d5d79d39228a3d6aad41f

Repackage all embedded libraries

- It allows to D8 to guarantee which version of libraries are used.

Bug: 64100567

Change-Id: Ic1d0a58c2f492dfb3acf6bfdb1f8ced36e26b8dc

build.gradle

diff --git a/build.gradle b/build.gradle
index a00c516..42d8292 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,6 +7,7 @@
 apply plugin: 'java'
 apply plugin: 'idea'
 apply plugin: 'com.google.protobuf'
+apply plugin: 'com.github.johnrengelman.shadow'
 
 apply from: 'copyAdditionalJctfCommonFiles.gradle'
 
@@ -23,9 +24,11 @@
 buildscript {
     repositories {
         mavenCentral()
+        jcenter()
     }
     dependencies {
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.1'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.1'
     }
 }
 
@@ -318,17 +321,25 @@
     }
 }
 
-task D8(type: Jar) {
+task D8(type: com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
     from sourceSets.main.output
     baseName 'd8'
+    classifier = null
+    version = null
     manifest {
-      attributes 'Main-Class': 'com.android.tools.r8.D8'
+        attributes 'Main-Class': 'com.android.tools.r8.D8'
     }
     // In order to build without dependencies, pass the exclude_deps property using:
     // gradle -Pexclude_deps D8
     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]
     }
 }