Update makefiles for hidl adapter.
Bug: 37518178
Test: manual
Change-Id: I50e999907d3c64d2b039272b823971998da64d1b
diff --git a/wifi/1.0/Android.bp b/wifi/1.0/Android.bp
index d7db770..230b5a2 100644
--- a/wifi/1.0/Android.bp
+++ b/wifi/1.0/Android.bp
@@ -148,3 +148,100 @@
"libutils",
],
}
+
+genrule {
+ name: "android.hardware.wifi@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.wifi@1.0",
+ srcs: [
+ ":android.hardware.wifi@1.0_hal",
+ ],
+ out: [
+ "android/hardware/wifi/1.0/AWifi.cpp",
+ "android/hardware/wifi/1.0/AWifiApIface.cpp",
+ "android/hardware/wifi/1.0/AWifiChip.cpp",
+ "android/hardware/wifi/1.0/AWifiChipEventCallback.cpp",
+ "android/hardware/wifi/1.0/AWifiEventCallback.cpp",
+ "android/hardware/wifi/1.0/AWifiIface.cpp",
+ "android/hardware/wifi/1.0/AWifiNanIface.cpp",
+ "android/hardware/wifi/1.0/AWifiNanIfaceEventCallback.cpp",
+ "android/hardware/wifi/1.0/AWifiP2pIface.cpp",
+ "android/hardware/wifi/1.0/AWifiRttController.cpp",
+ "android/hardware/wifi/1.0/AWifiRttControllerEventCallback.cpp",
+ "android/hardware/wifi/1.0/AWifiStaIface.cpp",
+ "android/hardware/wifi/1.0/AWifiStaIfaceEventCallback.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.wifi@1.0-adapter-helper_genc++_headers",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0",
+ srcs: [
+ ":android.hardware.wifi@1.0_hal",
+ ],
+ out: [
+ "android/hardware/wifi/1.0/AWifi.h",
+ "android/hardware/wifi/1.0/AWifiApIface.h",
+ "android/hardware/wifi/1.0/AWifiChip.h",
+ "android/hardware/wifi/1.0/AWifiChipEventCallback.h",
+ "android/hardware/wifi/1.0/AWifiEventCallback.h",
+ "android/hardware/wifi/1.0/AWifiIface.h",
+ "android/hardware/wifi/1.0/AWifiNanIface.h",
+ "android/hardware/wifi/1.0/AWifiNanIfaceEventCallback.h",
+ "android/hardware/wifi/1.0/AWifiP2pIface.h",
+ "android/hardware/wifi/1.0/AWifiRttController.h",
+ "android/hardware/wifi/1.0/AWifiRttControllerEventCallback.h",
+ "android/hardware/wifi/1.0/AWifiStaIface.h",
+ "android/hardware/wifi/1.0/AWifiStaIfaceEventCallback.h",
+ ],
+}
+
+
+cc_library {
+ name: "android.hardware.wifi@1.0-adapter-helper",
+ defaults: ["hidl-module-defaults"],
+ generated_sources: ["android.hardware.wifi@1.0-adapter-helper_genc++"],
+ generated_headers: ["android.hardware.wifi@1.0-adapter-helper_genc++_headers"],
+ export_generated_headers: ["android.hardware.wifi@1.0-adapter-helper_genc++_headers"],
+ vendor_available: true,
+ shared_libs: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "liblog",
+ "libutils",
+ "libcutils",
+ "libhidladapter",
+ "android.hardware.wifi@1.0",
+ "android.hidl.base@1.0-adapter-helper",
+ ],
+ export_shared_lib_headers: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "libutils",
+ "libhidladapter",
+ "android.hardware.wifi@1.0",
+ "android.hidl.base@1.0-adapter-helper",
+ ],
+}
+
+genrule {
+ name: "android.hardware.wifi@1.0-adapter_genc++",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0",
+ out: ["main.cpp"]}
+
+cc_test {
+ name: "android.hardware.wifi@1.0-adapter",
+ shared_libs: [
+ "libhidladapter",
+ "libhidlbase",
+ "libhidltransport",
+ "libutils",
+ "android.hardware.wifi@1.0",
+ "android.hardware.wifi@1.0-adapter-helper",
+ ],
+ generated_sources: ["android.hardware.wifi@1.0-adapter_genc++"],
+}
diff --git a/wifi/supplicant/1.0/Android.bp b/wifi/supplicant/1.0/Android.bp
index 978192d..e9d37b0 100644
--- a/wifi/supplicant/1.0/Android.bp
+++ b/wifi/supplicant/1.0/Android.bp
@@ -141,3 +141,98 @@
"libutils",
],
}
+
+genrule {
+ name: "android.hardware.wifi.supplicant@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.wifi.supplicant@1.0",
+ srcs: [
+ ":android.hardware.wifi.supplicant@1.0_hal",
+ ],
+ out: [
+ "android/hardware/wifi/supplicant/1.0/ASupplicant.cpp",
+ "android/hardware/wifi/supplicant/1.0/ASupplicantCallback.cpp",
+ "android/hardware/wifi/supplicant/1.0/ASupplicantIface.cpp",
+ "android/hardware/wifi/supplicant/1.0/ASupplicantNetwork.cpp",
+ "android/hardware/wifi/supplicant/1.0/ASupplicantP2pIface.cpp",
+ "android/hardware/wifi/supplicant/1.0/ASupplicantP2pIfaceCallback.cpp",
+ "android/hardware/wifi/supplicant/1.0/ASupplicantP2pNetwork.cpp",
+ "android/hardware/wifi/supplicant/1.0/ASupplicantP2pNetworkCallback.cpp",
+ "android/hardware/wifi/supplicant/1.0/ASupplicantStaIface.cpp",
+ "android/hardware/wifi/supplicant/1.0/ASupplicantStaIfaceCallback.cpp",
+ "android/hardware/wifi/supplicant/1.0/ASupplicantStaNetwork.cpp",
+ "android/hardware/wifi/supplicant/1.0/ASupplicantStaNetworkCallback.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.wifi.supplicant@1.0-adapter-helper_genc++_headers",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.0",
+ srcs: [
+ ":android.hardware.wifi.supplicant@1.0_hal",
+ ],
+ out: [
+ "android/hardware/wifi/supplicant/1.0/ASupplicant.h",
+ "android/hardware/wifi/supplicant/1.0/ASupplicantCallback.h",
+ "android/hardware/wifi/supplicant/1.0/ASupplicantIface.h",
+ "android/hardware/wifi/supplicant/1.0/ASupplicantNetwork.h",
+ "android/hardware/wifi/supplicant/1.0/ASupplicantP2pIface.h",
+ "android/hardware/wifi/supplicant/1.0/ASupplicantP2pIfaceCallback.h",
+ "android/hardware/wifi/supplicant/1.0/ASupplicantP2pNetwork.h",
+ "android/hardware/wifi/supplicant/1.0/ASupplicantP2pNetworkCallback.h",
+ "android/hardware/wifi/supplicant/1.0/ASupplicantStaIface.h",
+ "android/hardware/wifi/supplicant/1.0/ASupplicantStaIfaceCallback.h",
+ "android/hardware/wifi/supplicant/1.0/ASupplicantStaNetwork.h",
+ "android/hardware/wifi/supplicant/1.0/ASupplicantStaNetworkCallback.h",
+ ],
+}
+
+
+cc_library {
+ name: "android.hardware.wifi.supplicant@1.0-adapter-helper",
+ defaults: ["hidl-module-defaults"],
+ generated_sources: ["android.hardware.wifi.supplicant@1.0-adapter-helper_genc++"],
+ generated_headers: ["android.hardware.wifi.supplicant@1.0-adapter-helper_genc++_headers"],
+ export_generated_headers: ["android.hardware.wifi.supplicant@1.0-adapter-helper_genc++_headers"],
+ vendor_available: true,
+ shared_libs: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "liblog",
+ "libutils",
+ "libcutils",
+ "libhidladapter",
+ "android.hardware.wifi.supplicant@1.0",
+ "android.hidl.base@1.0-adapter-helper",
+ ],
+ export_shared_lib_headers: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "libutils",
+ "libhidladapter",
+ "android.hardware.wifi.supplicant@1.0",
+ "android.hidl.base@1.0-adapter-helper",
+ ],
+}
+
+genrule {
+ name: "android.hardware.wifi.supplicant@1.0-adapter_genc++",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.0",
+ out: ["main.cpp"]}
+
+cc_test {
+ name: "android.hardware.wifi.supplicant@1.0-adapter",
+ shared_libs: [
+ "libhidladapter",
+ "libhidlbase",
+ "libhidltransport",
+ "libutils",
+ "android.hardware.wifi.supplicant@1.0",
+ "android.hardware.wifi.supplicant@1.0-adapter-helper",
+ ],
+ generated_sources: ["android.hardware.wifi.supplicant@1.0-adapter_genc++"],
+}