Update makefiles for hidl_interface.
Bug: 35570956
Test: manual
Change-Id: I7a220b78ee081240e1dc30ef5672ba39e3e98375
diff --git a/power/1.0/Android.bp b/power/1.0/Android.bp
index 5ac42f6..92c9483 100644
--- a/power/1.0/Android.bp
+++ b/power/1.0/Android.bp
@@ -1,171 +1,25 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
-filegroup {
- name: "android.hardware.power@1.0_hal",
+hidl_interface {
+ name: "android.hardware.power@1.0",
+ root: "android.hardware",
+ vndk: {
+ enabled: true,
+ },
srcs: [
"types.hal",
"IPower.hal",
],
+ interfaces: [
+ "android.hidl.base@1.0",
+ ],
+ types: [
+ "Feature",
+ "PowerHint",
+ "PowerStatePlatformSleepState",
+ "PowerStateVoter",
+ "Status",
+ ],
+ gen_java: true,
}
-genrule {
- name: "android.hardware.power@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.power@1.0",
- srcs: [
- ":android.hardware.power@1.0_hal",
- ],
- out: [
- "android/hardware/power/1.0/types.cpp",
- "android/hardware/power/1.0/PowerAll.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.power@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.power@1.0",
- srcs: [
- ":android.hardware.power@1.0_hal",
- ],
- out: [
- "android/hardware/power/1.0/types.h",
- "android/hardware/power/1.0/hwtypes.h",
- "android/hardware/power/1.0/IPower.h",
- "android/hardware/power/1.0/IHwPower.h",
- "android/hardware/power/1.0/BnHwPower.h",
- "android/hardware/power/1.0/BpHwPower.h",
- "android/hardware/power/1.0/BsPower.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.power@1.0",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.power@1.0_genc++"],
- generated_headers: ["android.hardware.power@1.0_genc++_headers"],
- export_generated_headers: ["android.hardware.power@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",
- ],
-}
-
-genrule {
- name: "android.hardware.power-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.power@1.0",
- srcs: [
- ":android.hardware.power@1.0_hal",
- ],
- out: [
- "android/hardware/power/V1_0/Feature.java",
- "android/hardware/power/V1_0/PowerHint.java",
- "android/hardware/power/V1_0/PowerStatePlatformSleepState.java",
- "android/hardware/power/V1_0/PowerStateVoter.java",
- "android/hardware/power/V1_0/Status.java",
- "android/hardware/power/V1_0/IPower.java",
- ],
-}
-
-java_library {
- name: "android.hardware.power-V1.0-java",
- no_framework_libs: true,
- defaults: ["hidl-java-module-defaults"],
- srcs: [":android.hardware.power-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.power@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.power@1.0",
- srcs: [
- ":android.hardware.power@1.0_hal",
- ],
- out: [
- "android/hardware/power/1.0/APower.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.power@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.power@1.0",
- srcs: [
- ":android.hardware.power@1.0_hal",
- ],
- out: [
- "android/hardware/power/1.0/APower.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.power@1.0-adapter-helper",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.power@1.0-adapter-helper_genc++"],
- generated_headers: ["android.hardware.power@1.0-adapter-helper_genc++_headers"],
- export_generated_headers: ["android.hardware.power@1.0-adapter-helper_genc++_headers"],
- vendor_available: true,
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libhidladapter",
- "android.hardware.power@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "libhidladapter",
- "android.hardware.power@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
-}
-
-genrule {
- name: "android.hardware.power@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.power@1.0",
- out: ["main.cpp"]
-}
-
-cc_test {
- name: "android.hardware.power@1.0-adapter",
- defaults: ["hidl-module-defaults"],
- shared_libs: [
- "libhidladapter",
- "libhidlbase",
- "libhidltransport",
- "libutils",
- "android.hardware.power@1.0",
- "android.hardware.power@1.0-adapter-helper",
- ],
- generated_sources: ["android.hardware.power@1.0-adapter_genc++"],
-}