Update makefiles for hidl_interface.
Bug: 35570956
Test: manual
Change-Id: I7a220b78ee081240e1dc30ef5672ba39e3e98375
diff --git a/wifi/offload/1.0/Android.bp b/wifi/offload/1.0/Android.bp
index 12b2ff6..c6c0e7a 100644
--- a/wifi/offload/1.0/Android.bp
+++ b/wifi/offload/1.0/Android.bp
@@ -1,154 +1,33 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
-filegroup {
- name: "android.hardware.wifi.offload@1.0_hal",
+hidl_interface {
+ name: "android.hardware.wifi.offload@1.0",
+ root: "android.hardware",
+ vndk: {
+ enabled: true,
+ },
srcs: [
"types.hal",
"IOffload.hal",
"IOffloadCallback.hal",
],
+ interfaces: [
+ "android.hidl.base@1.0",
+ ],
+ types: [
+ "Capability",
+ "LogRecord",
+ "NetworkInfo",
+ "OffloadStatus",
+ "OffloadStatusCode",
+ "RecordName",
+ "ScanFilter",
+ "ScanParam",
+ "ScanRecord",
+ "ScanResult",
+ "ScanStats",
+ "SecurityMode",
+ ],
+ gen_java: false,
}
-genrule {
- name: "android.hardware.wifi.offload@1.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.offload@1.0",
- srcs: [
- ":android.hardware.wifi.offload@1.0_hal",
- ],
- out: [
- "android/hardware/wifi/offload/1.0/types.cpp",
- "android/hardware/wifi/offload/1.0/OffloadAll.cpp",
- "android/hardware/wifi/offload/1.0/OffloadCallbackAll.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.wifi.offload@1.0_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.offload@1.0",
- srcs: [
- ":android.hardware.wifi.offload@1.0_hal",
- ],
- out: [
- "android/hardware/wifi/offload/1.0/types.h",
- "android/hardware/wifi/offload/1.0/hwtypes.h",
- "android/hardware/wifi/offload/1.0/IOffload.h",
- "android/hardware/wifi/offload/1.0/IHwOffload.h",
- "android/hardware/wifi/offload/1.0/BnHwOffload.h",
- "android/hardware/wifi/offload/1.0/BpHwOffload.h",
- "android/hardware/wifi/offload/1.0/BsOffload.h",
- "android/hardware/wifi/offload/1.0/IOffloadCallback.h",
- "android/hardware/wifi/offload/1.0/IHwOffloadCallback.h",
- "android/hardware/wifi/offload/1.0/BnHwOffloadCallback.h",
- "android/hardware/wifi/offload/1.0/BpHwOffloadCallback.h",
- "android/hardware/wifi/offload/1.0/BsOffloadCallback.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.wifi.offload@1.0",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.wifi.offload@1.0_genc++"],
- generated_headers: ["android.hardware.wifi.offload@1.0_genc++_headers"],
- export_generated_headers: ["android.hardware.wifi.offload@1.0_genc++_headers"],
- vendor_available: true,
- vndk: {
- enabled: true,
- },
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- ],
-}
-
-// This package is not java compatible. Not creating java target.
-
-// This package does not export any types. Not creating java constants export.
-
-
-genrule {
- name: "android.hardware.wifi.offload@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.offload@1.0",
- srcs: [
- ":android.hardware.wifi.offload@1.0_hal",
- ],
- out: [
- "android/hardware/wifi/offload/1.0/AOffload.cpp",
- "android/hardware/wifi/offload/1.0/AOffloadCallback.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.wifi.offload@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.offload@1.0",
- srcs: [
- ":android.hardware.wifi.offload@1.0_hal",
- ],
- out: [
- "android/hardware/wifi/offload/1.0/AOffload.h",
- "android/hardware/wifi/offload/1.0/AOffloadCallback.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.wifi.offload@1.0-adapter-helper",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.wifi.offload@1.0-adapter-helper_genc++"],
- generated_headers: ["android.hardware.wifi.offload@1.0-adapter-helper_genc++_headers"],
- export_generated_headers: ["android.hardware.wifi.offload@1.0-adapter-helper_genc++_headers"],
- vendor_available: true,
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libhidladapter",
- "android.hardware.wifi.offload@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "libhidladapter",
- "android.hardware.wifi.offload@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
-}
-
-genrule {
- name: "android.hardware.wifi.offload@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.offload@1.0",
- out: ["main.cpp"]
-}
-
-cc_test {
- name: "android.hardware.wifi.offload@1.0-adapter",
- defaults: ["hidl-module-defaults"],
- shared_libs: [
- "libhidladapter",
- "libhidlbase",
- "libhidltransport",
- "libutils",
- "android.hardware.wifi.offload@1.0",
- "android.hardware.wifi.offload@1.0-adapter-helper",
- ],
- generated_sources: ["android.hardware.wifi.offload@1.0-adapter_genc++"],
-}