Update makefiles for Android.bp Java.
Also, moved legacy android.hidl.base-V1.0-java-static
target into a more maintainable location until we can
completely remove it.
Bug: 33420795
Test: pass
Change-Id: I3144d83ff3f691b21c96068a9605e2b3481bdea7
diff --git a/transport/manager/1.0/Android.bp b/transport/manager/1.0/Android.bp
index eeb0c99..a0898d7 100644
--- a/transport/manager/1.0/Android.bp
+++ b/transport/manager/1.0/Android.bp
@@ -45,6 +45,33 @@
// android.hidl.manager@1.0 is exported from libhidltransport
genrule {
+ name: "android.hidl.manager-V1.0-java_gen_java",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hidl:system/libhidl/transport android.hidl.manager@1.0",
+ srcs: [
+ ":android.hidl.manager@1.0_hal",
+ ],
+ out: [
+ "android/hidl/manager/V1_0/IServiceManager.java",
+ "android/hidl/manager/V1_0/IServiceNotification.java",
+ ],
+}
+
+java_library {
+ name: "android.hidl.manager-V1.0-java",
+ no_framework_libs: true,
+ defaults: ["hidl-java-module-defaults"],
+ srcs: [":android.hidl.manager-V1.0-java_gen_java"],
+ libs: [
+ "hwbinder",
+ "android.hidl.base-V1.0-java",
+ ]
+}
+
+// This package does not export any types. Not creating java constants export.
+
+
+genrule {
name: "android.hidl.manager@1.0-adapter-helper_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hidl:system/libhidl/transport android.hidl.manager@1.0",
@@ -70,7 +97,6 @@
],
}
-
cc_library {
name: "android.hidl.manager@1.0-adapter-helper",
defaults: ["hidl-module-defaults"],