Update for Soong-only makefiles.
Test: pass
Bug: 33420795
Change-Id: Ibec6d1e38939b9e7566a96381439be2aac3bf8ca
diff --git a/weaver/1.0/Android.bp b/weaver/1.0/Android.bp
index c407753..b7bf1fe 100644
--- a/weaver/1.0/Android.bp
+++ b/weaver/1.0/Android.bp
@@ -66,6 +66,36 @@
}
genrule {
+ name: "android.hardware.weaver-V1.0-java_gen_java",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.weaver@1.0",
+ srcs: [
+ ":android.hardware.weaver@1.0_hal",
+ ],
+ out: [
+ "android/hardware/weaver/V1_0/WeaverConfig.java",
+ "android/hardware/weaver/V1_0/WeaverReadResponse.java",
+ "android/hardware/weaver/V1_0/WeaverReadStatus.java",
+ "android/hardware/weaver/V1_0/WeaverStatus.java",
+ "android/hardware/weaver/V1_0/IWeaver.java",
+ ],
+}
+
+java_library {
+ name: "android.hardware.weaver-V1.0-java",
+ no_framework_libs: true,
+ defaults: ["hidl-java-module-defaults"],
+ srcs: [":android.hardware.weaver-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.hardware.weaver@1.0-adapter-helper_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.weaver@1.0",
@@ -89,7 +119,6 @@
],
}
-
cc_library {
name: "android.hardware.weaver@1.0-adapter-helper",
defaults: ["hidl-module-defaults"],
@@ -128,6 +157,7 @@
cc_test {
name: "android.hardware.weaver@1.0-adapter",
+ defaults: ["hidl-module-defaults"],
shared_libs: [
"libhidladapter",
"libhidlbase",