Update makefiles for hidl_interface.
Bug: 35570956
Test: manual
Change-Id: I7a220b78ee081240e1dc30ef5672ba39e3e98375
diff --git a/tv/input/1.0/Android.bp b/tv/input/1.0/Android.bp
index 3ec81e8..1bf3930 100644
--- a/tv/input/1.0/Android.bp
+++ b/tv/input/1.0/Android.bp
@@ -1,175 +1,30 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
-filegroup {
- name: "android.hardware.tv.input@1.0_hal",
+hidl_interface {
+ name: "android.hardware.tv.input@1.0",
+ root: "android.hardware",
+ vndk: {
+ enabled: true,
+ },
srcs: [
"types.hal",
"ITvInput.hal",
"ITvInputCallback.hal",
],
-}
-
-genrule {
- name: "android.hardware.tv.input@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.tv.input@1.0",
- srcs: [
- ":android.hardware.tv.input@1.0_hal",
- ],
- out: [
- "android/hardware/tv/input/1.0/types.cpp",
- "android/hardware/tv/input/1.0/TvInputAll.cpp",
- "android/hardware/tv/input/1.0/TvInputCallbackAll.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.tv.input@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.tv.input@1.0",
- srcs: [
- ":android.hardware.tv.input@1.0_hal",
- ],
- out: [
- "android/hardware/tv/input/1.0/types.h",
- "android/hardware/tv/input/1.0/hwtypes.h",
- "android/hardware/tv/input/1.0/ITvInput.h",
- "android/hardware/tv/input/1.0/IHwTvInput.h",
- "android/hardware/tv/input/1.0/BnHwTvInput.h",
- "android/hardware/tv/input/1.0/BpHwTvInput.h",
- "android/hardware/tv/input/1.0/BsTvInput.h",
- "android/hardware/tv/input/1.0/ITvInputCallback.h",
- "android/hardware/tv/input/1.0/IHwTvInputCallback.h",
- "android/hardware/tv/input/1.0/BnHwTvInputCallback.h",
- "android/hardware/tv/input/1.0/BpHwTvInputCallback.h",
- "android/hardware/tv/input/1.0/BsTvInputCallback.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.tv.input@1.0",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.tv.input@1.0_genc++"],
- generated_headers: ["android.hardware.tv.input@1.0_genc++_headers"],
- export_generated_headers: ["android.hardware.tv.input@1.0_genc++_headers"],
- vendor_available: true,
- vndk: {
- enabled: true,
- },
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
+ interfaces: [
"android.hardware.audio.common@2.0",
+ "android.hidl.base@1.0",
],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hardware.audio.common@2.0",
+ types: [
+ "CableConnectionStatus",
+ "Result",
+ "TvInputDeviceInfo",
+ "TvInputEvent",
+ "TvInputEventType",
+ "TvInputType",
+ "TvStreamConfig",
],
+ gen_java: false,
+ gen_java_constants: true,
}
-// This package is not java compatible. Not creating java target.
-
-genrule {
- name: "android.hardware.tv.input-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.tv.input@1.0",
- srcs: [
- ":android.hardware.tv.input@1.0_hal",
- ],
- out: [
- "android/hardware/tv/input/V1_0/Constants.java",
- ],
-}
-
-java_library {
- name: "android.hardware.tv.input-V1.0-java-constants",
- no_framework_libs: true,
- defaults: ["hidl-java-module-defaults"],
- srcs: [":android.hardware.tv.input-V1.0-java-constants_gen_java"],
-}
-
-genrule {
- name: "android.hardware.tv.input@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.tv.input@1.0",
- srcs: [
- ":android.hardware.tv.input@1.0_hal",
- ],
- out: [
- "android/hardware/tv/input/1.0/ATvInput.cpp",
- "android/hardware/tv/input/1.0/ATvInputCallback.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.tv.input@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.tv.input@1.0",
- srcs: [
- ":android.hardware.tv.input@1.0_hal",
- ],
- out: [
- "android/hardware/tv/input/1.0/ATvInput.h",
- "android/hardware/tv/input/1.0/ATvInputCallback.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.tv.input@1.0-adapter-helper",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.tv.input@1.0-adapter-helper_genc++"],
- generated_headers: ["android.hardware.tv.input@1.0-adapter-helper_genc++_headers"],
- export_generated_headers: ["android.hardware.tv.input@1.0-adapter-helper_genc++_headers"],
- vendor_available: true,
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libhidladapter",
- "android.hardware.audio.common@2.0",
- "android.hardware.tv.input@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "libhidladapter",
- "android.hardware.audio.common@2.0",
- "android.hardware.tv.input@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
-}
-
-genrule {
- name: "android.hardware.tv.input@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.tv.input@1.0",
- out: ["main.cpp"]
-}
-
-cc_test {
- name: "android.hardware.tv.input@1.0-adapter",
- defaults: ["hidl-module-defaults"],
- shared_libs: [
- "libhidladapter",
- "libhidlbase",
- "libhidltransport",
- "libutils",
- "android.hardware.audio.common@2.0",
- "android.hardware.tv.input@1.0",
- "android.hardware.tv.input@1.0-adapter-helper",
- ],
- generated_sources: ["android.hardware.tv.input@1.0-adapter_genc++"],
-}