commit 414ff957ecfbe3b6393b4c5cbb2385b326e2f22f
author Ian Zerny <zerny@google.com> Mon Apr 04 12:57:39 2022 +0200
committer Ian Zerny <zerny@google.com> Mon Apr 04 12:57:39 2022 +0200
tree 5c53271e167bbdf7ba99ea866ad8860217185e76
parent 3d7bf6717eab7f40e6b2ead5fdae70ec97df3ea7

Rename R8 library target and add R8 binary target.

Bug: b/227746536
Test: n/a
Change-Id: Iab7c11961919452552d7f057a19f588f42f6d91c

Android.bp

diff --git a/Android.bp b/Android.bp
index 8078b69..8a2f730 100644
--- a/Android.bp
+++ b/Android.bp
@@ -54,7 +54,7 @@
 java_binary_host {
     name: "d8",
     wrapper: "d8",
-    static_libs: ["r8"],
+    static_libs: ["r8lib"],
     target: {
         windows: {
             enabled: true,
@@ -66,24 +66,30 @@
 java_binary_host {
     name: "r8-compat-proguard",
     wrapper: "r8-compat-proguard",
-    static_libs: ["r8"],
+    static_libs: ["r8lib"],
+}
+
+java_binary_host {
+    name: "r8",
+    main_class: "com.android.tools.r8.R8",
+    static_libs: ["r8lib"]
 }
 
 java_binary_host {
     name: "retrace",
     main_class: "com.android.tools.r8.retrace.RetraceWrapper",
     srcs: ["src/com/android/tools/r8/retrace/RetraceWrapper.java"],
-    static_libs: ["r8"],
+    static_libs: ["r8lib"],
 }
 
 java_binary_host {
     name: "extractmarker",
     main_class: "com.android.tools.r8.ExtractMarker",
-    static_libs: ["r8"],
+    static_libs: ["r8lib"],
 }
 
 java_import_host {
-    name: "r8",
+    name: "r8lib",
     jars: ["r8.jar"],
     target: {
         windows: {