diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-11-16 01:30:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-11-16 01:30:56 +0000 |
| commit | fdac55c253bce064163768531b6f2706db567329 (patch) | |
| tree | 947aab53bbd509f51092fd3ee74f0edb6902c3a5 | |
| parent | 4f6bac4a430315e52e93093e7bc5537c803f474c (diff) | |
| parent | 8ebaad8efd83f391ff26659037cfdaf9492e456e (diff) | |
| download | r8-fdac55c253bce064163768531b6f2706db567329.tar.gz | |
Merge "Rename d8 ToT to d8-compat-dx"
| -rw-r--r-- | Android.bp | 6 | ||||
| -rwxr-xr-x | etc/d8-compat-dx (renamed from etc/d8) | 2 | ||||
| -rw-r--r-- | manifest_d8_compat_dx.txt (renamed from manifest_d8.txt) | 0 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp index b14a1a0e5..472c5e087 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" ], } diff --git a/etc/d8 b/etc/d8-compat-dx index 1c95c0f38..21d391fa4 100755 --- a/etc/d8 +++ b/etc/d8-compat-dx @@ -34,7 +34,7 @@ progdir=`pwd` prog="${progdir}"/`basename "${prog}"` cd "${oldwd}" -jarfile=d8.jar +jarfile=d8-compat-dx.jar libdir="$progdir" if [ ! -r "$libdir/$jarfile" ]; then diff --git a/manifest_d8.txt b/manifest_d8_compat_dx.txt index 08edb39c0..08edb39c0 100644 --- a/manifest_d8.txt +++ b/manifest_d8_compat_dx.txt |