Revert "Revert "Update D8 and R8 to 2.0.8-dev""
This reverts commit 24cf31482d9aa84530382b6e147f42206e358409.
Reason for revert: Vogar issues leading to revert has been addressed.
Change-Id: Iaf7a85ab0b4f12ce6374b4ca3c131265234d14a6
diff --git a/Android.bp b/Android.bp
index badcc61..d05f2f0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,33 +1,23 @@
java_binary_host {
name: "d8",
wrapper: "d8",
- static_libs: [ "r8-master" ],
+ static_libs: [ "r8" ],
}
java_binary_host {
name: "d8-compat-dx",
wrapper: "d8-compat-dx",
- static_libs: [ "d8-compat-dx-master" ],
+ static_libs: [ "r8" ],
}
java_binary_host {
name: "r8-compat-proguard",
wrapper: "r8-compat-proguard",
- static_libs: [ "r8-compat-proguard-master" ],
+ static_libs: [ "r8" ],
}
java_import_host {
- name: "r8-master",
- jars: ["r8-master.jar"],
-}
-
-java_import_host {
- name: "d8-compat-dx-master",
- jars: ["compatdx-master.jar"],
-}
-
-java_import_host {
- name: "r8-compat-proguard-master",
- jars: ["compatproguard-master.jar"],
+ name: "r8",
+ jars: ["r8.jar"],
}