Translate java libraries to java_library

In androidmk, translate BUILD_JAVA_LIBRARY to java_library plus
installable: true, and BUILD_STATIC_JAVA_LIBRARY to java_library.
In bpfix, rewrite java_library_static to java_library.

Bug: 110885583
Test: androidmk_test.go, bpfix_test.go
Change-Id: I63c2f759ae9c62a43f3439526552d2cd8e8cedc3

2 files changed, 47 insertions, 5 deletions

diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go
index e3eb82a9..29c7365e 100644
--- a/androidmk/cmd/androidmk/android.go
+++ b/androidmk/cmd/androidmk/android.go
@@ -747,8 +747,8 @@ var moduleTypes = map[string]string{
         "BUILD_NATIVE_BENCHMARK":      "cc_benchmark",
         "BUILD_HOST_NATIVE_BENCHMARK": "cc_benchmark_host",
 
-        "BUILD_JAVA_LIBRARY":             "java_library",
-        "BUILD_STATIC_JAVA_LIBRARY":      "java_library_static",
+        "BUILD_JAVA_LIBRARY":             "java_library_installable", // will be rewritten to java_library by bpfix
+        "BUILD_STATIC_JAVA_LIBRARY":      "java_library",
         "BUILD_HOST_JAVA_LIBRARY":        "java_library_host",
         "BUILD_HOST_DALVIK_JAVA_LIBRARY": "java_library_host_dalvik",
         "BUILD_PACKAGE":                  "android_app",
diff --git a/androidmk/cmd/androidmk/androidmk_test.go b/androidmk/cmd/androidmk/androidmk_test.go
index ed5ae022..80e7a75f 100644
--- a/androidmk/cmd/androidmk/androidmk_test.go
+++ b/androidmk/cmd/androidmk/androidmk_test.go
@@ -512,7 +512,7 @@ include $(call all-makefiles-under,$(LOCAL_PATH))
                         LOCAL_PROGUARD_ENABLED := obfuscation optimization
                         # Custom
                         LOCAL_PROGUARD_ENABLED := custom
-                        include $(BUILD_JAVA_LIBRARY)
+                        include $(BUILD_STATIC_JAVA_LIBRARY)
                 `,
                 expected: `
                         java_library {
@@ -535,11 +535,53 @@ include $(call all-makefiles-under,$(LOCAL_PATH))
                 `,
         },
         {
+                desc: "java library",
+                in: `
+                        include $(CLEAR_VARS)
+                        LOCAL_SRC_FILES := a.java
+                        include $(BUILD_STATIC_JAVA_LIBRARY)
+
+                        include $(CLEAR_VARS)
+                        LOCAL_SRC_FILES := b.java
+                        include $(BUILD_JAVA_LIBRARY)
+
+                        include $(CLEAR_VARS)
+                        LOCAL_SRC_FILES := c.java
+                        LOCAL_UNINSTALLABLE_MODULE := true
+                        include $(BUILD_JAVA_LIBRARY)
+
+                        include $(CLEAR_VARS)
+                        LOCAL_SRC_FILES := d.java
+                        LOCAL_UNINSTALLABLE_MODULE := false
+                        include $(BUILD_JAVA_LIBRARY)
+                `,
+                expected: `
+                        java_library {
+                                srcs: ["a.java"],
+                        }
+
+                        java_library {
+                                installable: true,
+                                srcs: ["b.java"],
+                        }
+
+                        java_library {
+                                installable: false,
+                                srcs: ["c.java"],
+                        }
+
+                        java_library {
+                                installable: true,
+                                srcs: ["d.java"],
+                        }
+                `,
+        },
+        {
                 desc: "errorprone options for java library",
                 in: `
                         include $(CLEAR_VARS)
                         LOCAL_ERROR_PRONE_FLAGS := -Xep:AsyncCallableReturnsNull:ERROR -Xep:AsyncFunctionReturnsNull:ERROR
-                        include $(BUILD_JAVA_LIBRARY)
+                        include $(BUILD_STATIC_JAVA_LIBRARY)
                 `,
                 expected: `
                         java_library {
@@ -631,7 +673,7 @@ include $(call all-makefiles-under,$(LOCAL_PATH))
                                 ],
                         }
 
-                        java_library_static {
+                        java_library {
                                 srcs: ["test.java"],
                                 static_libs: [],
                         }