Update makefiles for hidl_interface.
Bug: 35570956
Test: manual
Change-Id: I7a220b78ee081240e1dc30ef5672ba39e3e98375
diff --git a/vr/1.0/Android.bp b/vr/1.0/Android.bp
index f0a09bf..ca47a6e 100644
--- a/vr/1.0/Android.bp
+++ b/vr/1.0/Android.bp
@@ -1,162 +1,17 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
-filegroup {
- name: "android.hardware.vr@1.0_hal",
- srcs: [
- "IVr.hal",
- ],
-}
-
-genrule {
- name: "android.hardware.vr@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.vr@1.0",
- srcs: [
- ":android.hardware.vr@1.0_hal",
- ],
- out: [
- "android/hardware/vr/1.0/VrAll.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.vr@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.vr@1.0",
- srcs: [
- ":android.hardware.vr@1.0_hal",
- ],
- out: [
- "android/hardware/vr/1.0/IVr.h",
- "android/hardware/vr/1.0/IHwVr.h",
- "android/hardware/vr/1.0/BnHwVr.h",
- "android/hardware/vr/1.0/BpHwVr.h",
- "android/hardware/vr/1.0/BsVr.h",
- ],
-}
-
-cc_library {
+hidl_interface {
name: "android.hardware.vr@1.0",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.vr@1.0_genc++"],
- generated_headers: ["android.hardware.vr@1.0_genc++_headers"],
- export_generated_headers: ["android.hardware.vr@1.0_genc++_headers"],
- vendor_available: true,
+ root: "android.hardware",
vndk: {
enabled: true,
},
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- ],
-}
-
-genrule {
- name: "android.hardware.vr-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.vr@1.0",
srcs: [
- ":android.hardware.vr@1.0_hal",
+ "IVr.hal",
],
- out: [
- "android/hardware/vr/V1_0/IVr.java",
+ interfaces: [
+ "android.hidl.base@1.0",
],
+ gen_java: true,
}
-java_library {
- name: "android.hardware.vr-V1.0-java",
- no_framework_libs: true,
- defaults: ["hidl-java-module-defaults"],
- srcs: [":android.hardware.vr-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.vr@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.vr@1.0",
- srcs: [
- ":android.hardware.vr@1.0_hal",
- ],
- out: [
- "android/hardware/vr/1.0/AVr.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.vr@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.vr@1.0",
- srcs: [
- ":android.hardware.vr@1.0_hal",
- ],
- out: [
- "android/hardware/vr/1.0/AVr.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.vr@1.0-adapter-helper",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.vr@1.0-adapter-helper_genc++"],
- generated_headers: ["android.hardware.vr@1.0-adapter-helper_genc++_headers"],
- export_generated_headers: ["android.hardware.vr@1.0-adapter-helper_genc++_headers"],
- vendor_available: true,
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libhidladapter",
- "android.hardware.vr@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "libhidladapter",
- "android.hardware.vr@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
-}
-
-genrule {
- name: "android.hardware.vr@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.vr@1.0",
- out: ["main.cpp"]
-}
-
-cc_test {
- name: "android.hardware.vr@1.0-adapter",
- defaults: ["hidl-module-defaults"],
- shared_libs: [
- "libhidladapter",
- "libhidlbase",
- "libhidltransport",
- "libutils",
- "android.hardware.vr@1.0",
- "android.hardware.vr@1.0-adapter-helper",
- ],
- generated_sources: ["android.hardware.vr@1.0-adapter_genc++"],
-}