Update for Soong-only makefiles.
Test: pass
Bug: 33420795
Change-Id: Ibec6d1e38939b9e7566a96381439be2aac3bf8ca
diff --git a/wifi/1.2/Android.bp b/wifi/1.2/Android.bp
index 4cf5b35..7547848 100644
--- a/wifi/1.2/Android.bp
+++ b/wifi/1.2/Android.bp
@@ -73,6 +73,35 @@
}
genrule {
+ name: "android.hardware.wifi-V1.2-java_gen_java",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.2",
+ srcs: [
+ ":android.hardware.wifi@1.2_hal",
+ ],
+ out: [
+ "android/hardware/wifi/V1_2/IWifi.java",
+ "android/hardware/wifi/V1_2/IWifiChip.java",
+ ],
+}
+
+java_library {
+ name: "android.hardware.wifi-V1.2-java",
+ no_framework_libs: true,
+ defaults: ["hidl-java-module-defaults"],
+ srcs: [":android.hardware.wifi-V1.2-java_gen_java"],
+ libs: [
+ "hwbinder",
+ "android.hardware.wifi-V1.0-java",
+ "android.hardware.wifi-V1.1-java",
+ "android.hidl.base-V1.0-java",
+ ]
+}
+
+// This package does not export any types. Not creating java constants export.
+
+
+genrule {
name: "android.hardware.wifi@1.2-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.wifi@1.2",
@@ -98,7 +127,6 @@
],
}
-
cc_library {
name: "android.hardware.wifi@1.2-adapter-helper",
defaults: ["hidl-module-defaults"],
@@ -145,6 +173,7 @@
cc_test {
name: "android.hardware.wifi@1.2-adapter",
+ defaults: ["hidl-module-defaults"],
shared_libs: [
"libhidladapter",
"libhidlbase",