Convert to Android.bp
See build/soong/README.md for more information.
Bug: 31742855
Test: mma -j
Change-Id: Icb93f3b1b2caeb5e9c00f88ca35841b927ad075d
diff --git a/wifi/supplicant/1.0/Android.bp b/wifi/supplicant/1.0/Android.bp
new file mode 100644
index 0000000..6b4ca84
--- /dev/null
+++ b/wifi/supplicant/1.0/Android.bp
@@ -0,0 +1,86 @@
+// This file is autogenerated by hidl-gen. Do not edit manually.
+
+genrule {
+ name: "android.hardware.wifi.supplicant@1.0_genc++",
+ tool: "hidl-gen",
+ cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.wifi.supplicant@1.0",
+ srcs: [
+ "types.hal",
+ "ISupplicant.hal",
+ "ISupplicantCallback.hal",
+ "ISupplicantIface.hal",
+ "ISupplicantIfaceCallback.hal",
+ "ISupplicantNetwork.hal",
+ "ISupplicantNetworkCallback.hal",
+ ],
+ out: [
+ "android/hardware/wifi/supplicant/1.0/types.cpp",
+ "android/hardware/wifi/supplicant/1.0/SupplicantAll.cpp",
+ "android/hardware/wifi/supplicant/1.0/SupplicantCallbackAll.cpp",
+ "android/hardware/wifi/supplicant/1.0/SupplicantIfaceAll.cpp",
+ "android/hardware/wifi/supplicant/1.0/SupplicantIfaceCallbackAll.cpp",
+ "android/hardware/wifi/supplicant/1.0/SupplicantNetworkAll.cpp",
+ "android/hardware/wifi/supplicant/1.0/SupplicantNetworkCallbackAll.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.wifi.supplicant@1.0_genc++_headers",
+ tool: "hidl-gen",
+ cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.wifi.supplicant@1.0",
+ srcs: [
+ "types.hal",
+ "ISupplicant.hal",
+ "ISupplicantCallback.hal",
+ "ISupplicantIface.hal",
+ "ISupplicantIfaceCallback.hal",
+ "ISupplicantNetwork.hal",
+ "ISupplicantNetworkCallback.hal",
+ ],
+ out: [
+ "android/hardware/wifi/supplicant/1.0/types.h",
+ "android/hardware/wifi/supplicant/1.0/ISupplicant.h",
+ "android/hardware/wifi/supplicant/1.0/IHwSupplicant.h",
+ "android/hardware/wifi/supplicant/1.0/BnSupplicant.h",
+ "android/hardware/wifi/supplicant/1.0/BpSupplicant.h",
+ "android/hardware/wifi/supplicant/1.0/BsSupplicant.h",
+ "android/hardware/wifi/supplicant/1.0/ISupplicantCallback.h",
+ "android/hardware/wifi/supplicant/1.0/IHwSupplicantCallback.h",
+ "android/hardware/wifi/supplicant/1.0/BnSupplicantCallback.h",
+ "android/hardware/wifi/supplicant/1.0/BpSupplicantCallback.h",
+ "android/hardware/wifi/supplicant/1.0/BsSupplicantCallback.h",
+ "android/hardware/wifi/supplicant/1.0/ISupplicantIface.h",
+ "android/hardware/wifi/supplicant/1.0/IHwSupplicantIface.h",
+ "android/hardware/wifi/supplicant/1.0/BnSupplicantIface.h",
+ "android/hardware/wifi/supplicant/1.0/BpSupplicantIface.h",
+ "android/hardware/wifi/supplicant/1.0/BsSupplicantIface.h",
+ "android/hardware/wifi/supplicant/1.0/ISupplicantIfaceCallback.h",
+ "android/hardware/wifi/supplicant/1.0/IHwSupplicantIfaceCallback.h",
+ "android/hardware/wifi/supplicant/1.0/BnSupplicantIfaceCallback.h",
+ "android/hardware/wifi/supplicant/1.0/BpSupplicantIfaceCallback.h",
+ "android/hardware/wifi/supplicant/1.0/BsSupplicantIfaceCallback.h",
+ "android/hardware/wifi/supplicant/1.0/ISupplicantNetwork.h",
+ "android/hardware/wifi/supplicant/1.0/IHwSupplicantNetwork.h",
+ "android/hardware/wifi/supplicant/1.0/BnSupplicantNetwork.h",
+ "android/hardware/wifi/supplicant/1.0/BpSupplicantNetwork.h",
+ "android/hardware/wifi/supplicant/1.0/BsSupplicantNetwork.h",
+ "android/hardware/wifi/supplicant/1.0/ISupplicantNetworkCallback.h",
+ "android/hardware/wifi/supplicant/1.0/IHwSupplicantNetworkCallback.h",
+ "android/hardware/wifi/supplicant/1.0/BnSupplicantNetworkCallback.h",
+ "android/hardware/wifi/supplicant/1.0/BpSupplicantNetworkCallback.h",
+ "android/hardware/wifi/supplicant/1.0/BsSupplicantNetworkCallback.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.wifi.supplicant@1.0",
+ generated_sources: ["android.hardware.wifi.supplicant@1.0_genc++"],
+ generated_headers: ["android.hardware.wifi.supplicant@1.0_genc++_headers"],
+ export_generated_headers: ["android.hardware.wifi.supplicant@1.0_genc++_headers"],
+ shared_libs: [
+ "libhidl",
+ "libhwbinder",
+ "libutils",
+ "libcutils",
+ ],
+}
diff --git a/wifi/supplicant/1.0/Android.mk b/wifi/supplicant/1.0/Android.mk
index 2671bdb..b2c39f5 100644
--- a/wifi/supplicant/1.0/Android.mk
+++ b/wifi/supplicant/1.0/Android.mk
@@ -1,159 +1,6 @@
+# This file is autogenerated by hidl-gen. Do not edit manually.
+
LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := android.hardware.wifi.supplicant@1.0
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-
-intermediates := $(local-generated-sources-dir)
-
-HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
-
-#
-# Build types.hal
-#
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/types.cpp
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Lc++ -randroid.hardware:hardware/interfaces \
- android.hardware.wifi.supplicant@1.0::types
-
-$(GEN): $(LOCAL_PATH)/types.hal
- $(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
-# Build ISupplicant.hal
-#
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/SupplicantAll.cpp
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicant.hal
-$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantCallback.hal
-$(GEN): $(LOCAL_PATH)/ISupplicantCallback.hal
-$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantIface.hal
-$(GEN): $(LOCAL_PATH)/ISupplicantIface.hal
-$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
-$(GEN): $(LOCAL_PATH)/types.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Lc++ -randroid.hardware:hardware/interfaces \
- android.hardware.wifi.supplicant@1.0::ISupplicant
-
-$(GEN): $(LOCAL_PATH)/ISupplicant.hal
- $(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
-# Build ISupplicantCallback.hal
-#
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/SupplicantCallbackAll.cpp
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantCallback.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Lc++ -randroid.hardware:hardware/interfaces \
- android.hardware.wifi.supplicant@1.0::ISupplicantCallback
-
-$(GEN): $(LOCAL_PATH)/ISupplicantCallback.hal
- $(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
-# Build ISupplicantIface.hal
-#
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/SupplicantIfaceAll.cpp
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantIface.hal
-$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantIfaceCallback.hal
-$(GEN): $(LOCAL_PATH)/ISupplicantIfaceCallback.hal
-$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantNetwork.hal
-$(GEN): $(LOCAL_PATH)/ISupplicantNetwork.hal
-$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
-$(GEN): $(LOCAL_PATH)/types.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Lc++ -randroid.hardware:hardware/interfaces \
- android.hardware.wifi.supplicant@1.0::ISupplicantIface
-
-$(GEN): $(LOCAL_PATH)/ISupplicantIface.hal
- $(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
-# Build ISupplicantIfaceCallback.hal
-#
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/SupplicantIfaceCallbackAll.cpp
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantIfaceCallback.hal
-$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
-$(GEN): $(LOCAL_PATH)/types.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Lc++ -randroid.hardware:hardware/interfaces \
- android.hardware.wifi.supplicant@1.0::ISupplicantIfaceCallback
-
-$(GEN): $(LOCAL_PATH)/ISupplicantIfaceCallback.hal
- $(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
-# Build ISupplicantNetwork.hal
-#
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/SupplicantNetworkAll.cpp
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantNetwork.hal
-$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantNetworkCallback.hal
-$(GEN): $(LOCAL_PATH)/ISupplicantNetworkCallback.hal
-$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
-$(GEN): $(LOCAL_PATH)/types.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Lc++ -randroid.hardware:hardware/interfaces \
- android.hardware.wifi.supplicant@1.0::ISupplicantNetwork
-
-$(GEN): $(LOCAL_PATH)/ISupplicantNetwork.hal
- $(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
-# Build ISupplicantNetworkCallback.hal
-#
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/SupplicantNetworkCallbackAll.cpp
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantNetworkCallback.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Lc++ -randroid.hardware:hardware/interfaces \
- android.hardware.wifi.supplicant@1.0::ISupplicantNetworkCallback
-
-$(GEN): $(LOCAL_PATH)/ISupplicantNetworkCallback.hal
- $(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
-LOCAL_SHARED_LIBRARIES := \
- libhidl \
- libhwbinder \
- libutils \
- libcutils \
-
-LOCAL_MULTILIB := both
-include $(BUILD_SHARED_LIBRARY)
################################################################################