Updating makefiles for hidl_interface.
Bug: 64487114
Test: manual
Merged-In: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
Change-Id: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
diff --git a/thermal/1.0/Android.bp b/thermal/1.0/Android.bp
index 43a0f68..e764e28 100644
--- a/thermal/1.0/Android.bp
+++ b/thermal/1.0/Android.bp
@@ -1,189 +1,28 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
-filegroup {
- name: "android.hardware.thermal@1.0_hal",
+hidl_interface {
+ name: "android.hardware.thermal@1.0",
+ root: "android.hardware",
+ vndk: {
+ enabled: true,
+ },
srcs: [
"types.hal",
"IThermal.hal",
],
+ interfaces: [
+ "android.hidl.base@1.0",
+ ],
+ types: [
+ "CoolingDevice",
+ "CoolingType",
+ "CpuUsage",
+ "Temperature",
+ "TemperatureType",
+ "ThermalStatus",
+ "ThermalStatusCode",
+ ],
+ gen_java: true,
+ gen_java_constants: true,
}
-genrule {
- name: "android.hardware.thermal@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.thermal@1.0",
- srcs: [
- ":android.hardware.thermal@1.0_hal",
- ],
- out: [
- "android/hardware/thermal/1.0/types.cpp",
- "android/hardware/thermal/1.0/ThermalAll.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.thermal@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.thermal@1.0",
- srcs: [
- ":android.hardware.thermal@1.0_hal",
- ],
- out: [
- "android/hardware/thermal/1.0/types.h",
- "android/hardware/thermal/1.0/hwtypes.h",
- "android/hardware/thermal/1.0/IThermal.h",
- "android/hardware/thermal/1.0/IHwThermal.h",
- "android/hardware/thermal/1.0/BnHwThermal.h",
- "android/hardware/thermal/1.0/BpHwThermal.h",
- "android/hardware/thermal/1.0/BsThermal.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.thermal@1.0",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.thermal@1.0_genc++"],
- generated_headers: ["android.hardware.thermal@1.0_genc++_headers"],
- export_generated_headers: ["android.hardware.thermal@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.thermal-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.thermal@1.0",
- srcs: [
- ":android.hardware.thermal@1.0_hal",
- ],
- out: [
- "android/hardware/thermal/V1_0/CoolingDevice.java",
- "android/hardware/thermal/V1_0/CoolingType.java",
- "android/hardware/thermal/V1_0/CpuUsage.java",
- "android/hardware/thermal/V1_0/Temperature.java",
- "android/hardware/thermal/V1_0/TemperatureType.java",
- "android/hardware/thermal/V1_0/ThermalStatus.java",
- "android/hardware/thermal/V1_0/ThermalStatusCode.java",
- "android/hardware/thermal/V1_0/IThermal.java",
- ],
-}
-
-java_library {
- name: "android.hardware.thermal-V1.0-java",
- no_framework_libs: true,
- defaults: ["hidl-java-module-defaults"],
- srcs: [":android.hardware.thermal-V1.0-java_gen_java"],
- libs: [
- "hwbinder",
- "android.hidl.base-V1.0-java",
- ]
-}
-
-genrule {
- name: "android.hardware.thermal-V1.0-java-constants_gen_java",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.0",
- srcs: [
- ":android.hardware.thermal@1.0_hal",
- ],
- out: [
- "android/hardware/thermal/V1_0/Constants.java",
- ],
-}
-
-java_library {
- name: "android.hardware.thermal-V1.0-java-constants",
- no_framework_libs: true,
- defaults: ["hidl-java-module-defaults"],
- srcs: [":android.hardware.thermal-V1.0-java-constants_gen_java"],
-}
-
-genrule {
- name: "android.hardware.thermal@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.thermal@1.0",
- srcs: [
- ":android.hardware.thermal@1.0_hal",
- ],
- out: [
- "android/hardware/thermal/1.0/AThermal.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.thermal@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.thermal@1.0",
- srcs: [
- ":android.hardware.thermal@1.0_hal",
- ],
- out: [
- "android/hardware/thermal/1.0/AThermal.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.thermal@1.0-adapter-helper",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.thermal@1.0-adapter-helper_genc++"],
- generated_headers: ["android.hardware.thermal@1.0-adapter-helper_genc++_headers"],
- export_generated_headers: ["android.hardware.thermal@1.0-adapter-helper_genc++_headers"],
- vendor_available: true,
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libhidladapter",
- "android.hardware.thermal@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "libhidladapter",
- "android.hardware.thermal@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
-}
-
-genrule {
- name: "android.hardware.thermal@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.thermal@1.0",
- out: ["main.cpp"]
-}
-
-cc_test {
- name: "android.hardware.thermal@1.0-adapter",
- defaults: ["hidl-module-defaults"],
- shared_libs: [
- "libhidladapter",
- "libhidlbase",
- "libhidltransport",
- "libutils",
- "android.hardware.thermal@1.0",
- "android.hardware.thermal@1.0-adapter-helper",
- ],
- generated_sources: ["android.hardware.thermal@1.0-adapter_genc++"],
-}
diff --git a/thermal/1.1/Android.bp b/thermal/1.1/Android.bp
index 5926993..8c0f1f9 100644
--- a/thermal/1.1/Android.bp
+++ b/thermal/1.1/Android.bp
@@ -1,180 +1,19 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
-filegroup {
- name: "android.hardware.thermal@1.1_hal",
+hidl_interface {
+ name: "android.hardware.thermal@1.1",
+ root: "android.hardware",
+ vndk: {
+ enabled: true,
+ },
srcs: [
"IThermal.hal",
"IThermalCallback.hal",
],
-}
-
-genrule {
- name: "android.hardware.thermal@1.1_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.1",
- srcs: [
- ":android.hardware.thermal@1.1_hal",
- ],
- out: [
- "android/hardware/thermal/1.1/ThermalAll.cpp",
- "android/hardware/thermal/1.1/ThermalCallbackAll.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.thermal@1.1_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.1",
- srcs: [
- ":android.hardware.thermal@1.1_hal",
- ],
- out: [
- "android/hardware/thermal/1.1/IThermal.h",
- "android/hardware/thermal/1.1/IHwThermal.h",
- "android/hardware/thermal/1.1/BnHwThermal.h",
- "android/hardware/thermal/1.1/BpHwThermal.h",
- "android/hardware/thermal/1.1/BsThermal.h",
- "android/hardware/thermal/1.1/IThermalCallback.h",
- "android/hardware/thermal/1.1/IHwThermalCallback.h",
- "android/hardware/thermal/1.1/BnHwThermalCallback.h",
- "android/hardware/thermal/1.1/BpHwThermalCallback.h",
- "android/hardware/thermal/1.1/BsThermalCallback.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.thermal@1.1",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.thermal@1.1_genc++"],
- generated_headers: ["android.hardware.thermal@1.1_genc++_headers"],
- export_generated_headers: ["android.hardware.thermal@1.1_genc++_headers"],
- vendor_available: true,
- vndk: {
- enabled: true,
- },
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
+ interfaces: [
"android.hardware.thermal@1.0",
+ "android.hidl.base@1.0",
],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hardware.thermal@1.0",
- ],
+ gen_java: true,
}
-genrule {
- name: "android.hardware.thermal-V1.1-java_gen_java",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.1",
- srcs: [
- ":android.hardware.thermal@1.1_hal",
- ],
- out: [
- "android/hardware/thermal/V1_1/IThermal.java",
- "android/hardware/thermal/V1_1/IThermalCallback.java",
- ],
-}
-
-java_library {
- name: "android.hardware.thermal-V1.1-java",
- no_framework_libs: true,
- defaults: ["hidl-java-module-defaults"],
- srcs: [":android.hardware.thermal-V1.1-java_gen_java"],
- libs: [
- "hwbinder",
- "android.hardware.thermal-V1.0-java",
- "android.hidl.base-V1.0-java",
- ]
-}
-
-// This package does not export any types. Not creating java constants export.
-
-
-genrule {
- name: "android.hardware.thermal@1.1-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.thermal@1.1",
- srcs: [
- ":android.hardware.thermal@1.1_hal",
- ],
- out: [
- "android/hardware/thermal/1.1/AThermal.cpp",
- "android/hardware/thermal/1.1/AThermalCallback.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.thermal@1.1-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.thermal@1.1",
- srcs: [
- ":android.hardware.thermal@1.1_hal",
- ],
- out: [
- "android/hardware/thermal/1.1/AThermal.h",
- "android/hardware/thermal/1.1/AThermalCallback.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.thermal@1.1-adapter-helper",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.thermal@1.1-adapter-helper_genc++"],
- generated_headers: ["android.hardware.thermal@1.1-adapter-helper_genc++_headers"],
- export_generated_headers: ["android.hardware.thermal@1.1-adapter-helper_genc++_headers"],
- vendor_available: true,
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libhidladapter",
- "android.hardware.thermal@1.0",
- "android.hardware.thermal@1.1",
- "android.hardware.thermal@1.0-adapter-helper",
- "android.hidl.base@1.0-adapter-helper",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "libhidladapter",
- "android.hardware.thermal@1.0",
- "android.hardware.thermal@1.1",
- "android.hardware.thermal@1.0-adapter-helper",
- "android.hidl.base@1.0-adapter-helper",
- ],
-}
-
-genrule {
- name: "android.hardware.thermal@1.1-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.thermal@1.1",
- out: ["main.cpp"]
-}
-
-cc_test {
- name: "android.hardware.thermal@1.1-adapter",
- defaults: ["hidl-module-defaults"],
- shared_libs: [
- "libhidladapter",
- "libhidlbase",
- "libhidltransport",
- "libutils",
- "android.hardware.thermal@1.0",
- "android.hardware.thermal@1.1",
- "android.hardware.thermal@1.1-adapter-helper",
- ],
- generated_sources: ["android.hardware.thermal@1.1-adapter_genc++"],
-}