commit fdac55c253bce064163768531b6f2706db567329
author Treehugger Robot <treehugger-gerrit@google.com> Thu Nov 16 01:30:56 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 16 01:30:56 2017 +0000
tree 947aab53bbd509f51092fd3ee74f0edb6902c3a5
parent 4f6bac4a430315e52e93093e7bc5537c803f474c
parent 8ebaad8efd83f391ff26659037cfdaf9492e456e

Merge "Rename d8 ToT to d8-compat-dx"

Android.bp

diff --git a/Android.bp b/Android.bp
index b14a1a0..472c5e0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,7 +1,7 @@
 java_binary_host {
-    name: "d8",
-    wrapper: "etc/d8",
-    manifest: "manifest_d8.txt",
+    name: "d8-compat-dx",
+    wrapper: "etc/d8-compat-dx",
+    manifest: "manifest_d8_compat_dx.txt",
     static_libs: [ "r8-src" ],
 }
 

etc/d8-compat-dx

diff --git a/etc/d8 b/etc/d8-compat-dx
similarity index 98%
rename from etc/d8
rename to etc/d8-compat-dx
index 1c95c0f..21d391f 100755
--- a/etc/d8
+++ b/etc/d8-compat-dx
@@ -34,7 +34,7 @@
 prog="${progdir}"/`basename "${prog}"`
 cd "${oldwd}"
 
-jarfile=d8.jar
+jarfile=d8-compat-dx.jar
 libdir="$progdir"
 
 if [ ! -r "$libdir/$jarfile" ]; then

manifest_d8_compat_dx.txt

diff --git a/manifest_d8.txt b/manifest_d8_compat_dx.txt
similarity index 100%
rename from manifest_d8.txt
rename to manifest_d8_compat_dx.txt