Update makefiles for hidl_interface.
Bug: 35570956
Test: manual
Change-Id: I7a220b78ee081240e1dc30ef5672ba39e3e98375
diff --git a/tests/memory/1.0/Android.bp b/tests/memory/1.0/Android.bp
index 0af8b65..cd97fe4 100644
--- a/tests/memory/1.0/Android.bp
+++ b/tests/memory/1.0/Android.bp
@@ -1,138 +1,14 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
-filegroup {
- name: "android.hardware.tests.memory@1.0_hal",
+hidl_interface {
+ name: "android.hardware.tests.memory@1.0",
+ root: "android.hardware",
srcs: [
"IMemoryTest.hal",
],
+ interfaces: [
+ "android.hidl.base@1.0",
+ ],
+ gen_java: false,
}
-genrule {
- name: "android.hardware.tests.memory@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.tests.memory@1.0",
- srcs: [
- ":android.hardware.tests.memory@1.0_hal",
- ],
- out: [
- "android/hardware/tests/memory/1.0/MemoryTestAll.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.tests.memory@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.tests.memory@1.0",
- srcs: [
- ":android.hardware.tests.memory@1.0_hal",
- ],
- out: [
- "android/hardware/tests/memory/1.0/IMemoryTest.h",
- "android/hardware/tests/memory/1.0/IHwMemoryTest.h",
- "android/hardware/tests/memory/1.0/BnHwMemoryTest.h",
- "android/hardware/tests/memory/1.0/BpHwMemoryTest.h",
- "android/hardware/tests/memory/1.0/BsMemoryTest.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.tests.memory@1.0",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.tests.memory@1.0_genc++"],
- generated_headers: ["android.hardware.tests.memory@1.0_genc++_headers"],
- export_generated_headers: ["android.hardware.tests.memory@1.0_genc++_headers"],
- vendor_available: 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.tests.memory@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.tests.memory@1.0",
- srcs: [
- ":android.hardware.tests.memory@1.0_hal",
- ],
- out: [
- "android/hardware/tests/memory/1.0/AMemoryTest.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.tests.memory@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.tests.memory@1.0",
- srcs: [
- ":android.hardware.tests.memory@1.0_hal",
- ],
- out: [
- "android/hardware/tests/memory/1.0/AMemoryTest.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.tests.memory@1.0-adapter-helper",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.tests.memory@1.0-adapter-helper_genc++"],
- generated_headers: ["android.hardware.tests.memory@1.0-adapter-helper_genc++_headers"],
- export_generated_headers: ["android.hardware.tests.memory@1.0-adapter-helper_genc++_headers"],
- vendor_available: true,
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libhidladapter",
- "android.hardware.tests.memory@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "libhidladapter",
- "android.hardware.tests.memory@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
-}
-
-genrule {
- name: "android.hardware.tests.memory@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.tests.memory@1.0",
- out: ["main.cpp"]
-}
-
-cc_test {
- name: "android.hardware.tests.memory@1.0-adapter",
- defaults: ["hidl-module-defaults"],
- shared_libs: [
- "libhidladapter",
- "libhidlbase",
- "libhidltransport",
- "libutils",
- "android.hardware.tests.memory@1.0",
- "android.hardware.tests.memory@1.0-adapter-helper",
- ],
- generated_sources: ["android.hardware.tests.memory@1.0-adapter_genc++"],
-}