Update makefiles for hidl_interface. am: ac81270e69
am: 1606ebcf57
Change-Id: I85f5769cb9d0aebe9f7bf36d93451290e7fb8b4d
diff --git a/Android.bp b/Android.bp
index 9ea8266..9f5bd89 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,10 +1,4 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "displayservice/1.0",
- "displayservice/1.0/vts/functional",
- "schedulerservice/1.0",
- "sensorservice/1.0",
- "sensorservice/1.0/vts/functional",
- "sensorservice/libsensorndkbridge",
- "vr/composer/1.0",
-]
+hidl_package_root {
+ name: "android.frameworks",
+ path: "frameworks/hardware/interfaces",
+}
diff --git a/displayservice/1.0/Android.bp b/displayservice/1.0/Android.bp
index ca8650c..4174b9f 100644
--- a/displayservice/1.0/Android.bp
+++ b/displayservice/1.0/Android.bp
@@ -1,187 +1,23 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
-filegroup {
- name: "android.frameworks.displayservice@1.0_hal",
+hidl_interface {
+ name: "android.frameworks.displayservice@1.0",
+ root: "android.frameworks",
+ vndk: {
+ enabled: true,
+ },
srcs: [
"types.hal",
"IDisplayEventReceiver.hal",
"IDisplayService.hal",
"IEventCallback.hal",
],
+ interfaces: [
+ "android.hidl.base@1.0",
+ ],
+ types: [
+ "Status",
+ ],
+ gen_java: true,
}
-genrule {
- name: "android.frameworks.displayservice@1.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.frameworks:frameworks/hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.displayservice@1.0",
- srcs: [
- ":android.frameworks.displayservice@1.0_hal",
- ],
- out: [
- "android/frameworks/displayservice/1.0/types.cpp",
- "android/frameworks/displayservice/1.0/DisplayEventReceiverAll.cpp",
- "android/frameworks/displayservice/1.0/DisplayServiceAll.cpp",
- "android/frameworks/displayservice/1.0/EventCallbackAll.cpp",
- ],
-}
-
-genrule {
- name: "android.frameworks.displayservice@1.0_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.frameworks:frameworks/hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.displayservice@1.0",
- srcs: [
- ":android.frameworks.displayservice@1.0_hal",
- ],
- out: [
- "android/frameworks/displayservice/1.0/types.h",
- "android/frameworks/displayservice/1.0/hwtypes.h",
- "android/frameworks/displayservice/1.0/IDisplayEventReceiver.h",
- "android/frameworks/displayservice/1.0/IHwDisplayEventReceiver.h",
- "android/frameworks/displayservice/1.0/BnHwDisplayEventReceiver.h",
- "android/frameworks/displayservice/1.0/BpHwDisplayEventReceiver.h",
- "android/frameworks/displayservice/1.0/BsDisplayEventReceiver.h",
- "android/frameworks/displayservice/1.0/IDisplayService.h",
- "android/frameworks/displayservice/1.0/IHwDisplayService.h",
- "android/frameworks/displayservice/1.0/BnHwDisplayService.h",
- "android/frameworks/displayservice/1.0/BpHwDisplayService.h",
- "android/frameworks/displayservice/1.0/BsDisplayService.h",
- "android/frameworks/displayservice/1.0/IEventCallback.h",
- "android/frameworks/displayservice/1.0/IHwEventCallback.h",
- "android/frameworks/displayservice/1.0/BnHwEventCallback.h",
- "android/frameworks/displayservice/1.0/BpHwEventCallback.h",
- "android/frameworks/displayservice/1.0/BsEventCallback.h",
- ],
-}
-
-cc_library {
- name: "android.frameworks.displayservice@1.0",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.frameworks.displayservice@1.0_genc++"],
- generated_headers: ["android.frameworks.displayservice@1.0_genc++_headers"],
- export_generated_headers: ["android.frameworks.displayservice@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.frameworks.displayservice-V1.0-java_gen_java",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.frameworks:frameworks/hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.displayservice@1.0",
- srcs: [
- ":android.frameworks.displayservice@1.0_hal",
- ],
- out: [
- "android/frameworks/displayservice/V1_0/Status.java",
- "android/frameworks/displayservice/V1_0/IDisplayEventReceiver.java",
- "android/frameworks/displayservice/V1_0/IDisplayService.java",
- "android/frameworks/displayservice/V1_0/IEventCallback.java",
- ],
-}
-
-java_library {
- name: "android.frameworks.displayservice-V1.0-java",
- no_framework_libs: true,
- defaults: ["hidl-java-module-defaults"],
- srcs: [":android.frameworks.displayservice-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.frameworks.displayservice@1.0-adapter-helper_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.frameworks:frameworks/hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.displayservice@1.0",
- srcs: [
- ":android.frameworks.displayservice@1.0_hal",
- ],
- out: [
- "android/frameworks/displayservice/1.0/ADisplayEventReceiver.cpp",
- "android/frameworks/displayservice/1.0/ADisplayService.cpp",
- "android/frameworks/displayservice/1.0/AEventCallback.cpp",
- ],
-}
-
-genrule {
- name: "android.frameworks.displayservice@1.0-adapter-helper_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.frameworks:frameworks/hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.displayservice@1.0",
- srcs: [
- ":android.frameworks.displayservice@1.0_hal",
- ],
- out: [
- "android/frameworks/displayservice/1.0/ADisplayEventReceiver.h",
- "android/frameworks/displayservice/1.0/ADisplayService.h",
- "android/frameworks/displayservice/1.0/AEventCallback.h",
- ],
-}
-
-cc_library {
- name: "android.frameworks.displayservice@1.0-adapter-helper",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.frameworks.displayservice@1.0-adapter-helper_genc++"],
- generated_headers: ["android.frameworks.displayservice@1.0-adapter-helper_genc++_headers"],
- export_generated_headers: ["android.frameworks.displayservice@1.0-adapter-helper_genc++_headers"],
- vendor_available: true,
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libhidladapter",
- "android.frameworks.displayservice@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "libhidladapter",
- "android.frameworks.displayservice@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
-}
-
-genrule {
- name: "android.frameworks.displayservice@1.0-adapter_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.frameworks:frameworks/hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.displayservice@1.0",
- out: ["main.cpp"]
-}
-
-cc_test {
- name: "android.frameworks.displayservice@1.0-adapter",
- defaults: ["hidl-module-defaults"],
- shared_libs: [
- "libhidladapter",
- "libhidlbase",
- "libhidltransport",
- "libutils",
- "android.frameworks.displayservice@1.0",
- "android.frameworks.displayservice@1.0-adapter-helper",
- ],
- generated_sources: ["android.frameworks.displayservice@1.0-adapter_genc++"],
-}
diff --git a/schedulerservice/1.0/Android.bp b/schedulerservice/1.0/Android.bp
index 52b71be..118ee2c 100644
--- a/schedulerservice/1.0/Android.bp
+++ b/schedulerservice/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.frameworks.schedulerservice@1.0_hal",
- srcs: [
- "ISchedulingPolicyService.hal",
- ],
-}
-
-genrule {
- name: "android.frameworks.schedulerservice@1.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.frameworks:frameworks/hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.schedulerservice@1.0",
- srcs: [
- ":android.frameworks.schedulerservice@1.0_hal",
- ],
- out: [
- "android/frameworks/schedulerservice/1.0/SchedulingPolicyServiceAll.cpp",
- ],
-}
-
-genrule {
- name: "android.frameworks.schedulerservice@1.0_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.frameworks:frameworks/hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.schedulerservice@1.0",
- srcs: [
- ":android.frameworks.schedulerservice@1.0_hal",
- ],
- out: [
- "android/frameworks/schedulerservice/1.0/ISchedulingPolicyService.h",
- "android/frameworks/schedulerservice/1.0/IHwSchedulingPolicyService.h",
- "android/frameworks/schedulerservice/1.0/BnHwSchedulingPolicyService.h",
- "android/frameworks/schedulerservice/1.0/BpHwSchedulingPolicyService.h",
- "android/frameworks/schedulerservice/1.0/BsSchedulingPolicyService.h",
- ],
-}
-
-cc_library {
+hidl_interface {
name: "android.frameworks.schedulerservice@1.0",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.frameworks.schedulerservice@1.0_genc++"],
- generated_headers: ["android.frameworks.schedulerservice@1.0_genc++_headers"],
- export_generated_headers: ["android.frameworks.schedulerservice@1.0_genc++_headers"],
- vendor_available: true,
+ root: "android.frameworks",
vndk: {
enabled: true,
},
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- ],
-}
-
-genrule {
- name: "android.frameworks.schedulerservice-V1.0-java_gen_java",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.frameworks:frameworks/hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.schedulerservice@1.0",
srcs: [
- ":android.frameworks.schedulerservice@1.0_hal",
+ "ISchedulingPolicyService.hal",
],
- out: [
- "android/frameworks/schedulerservice/V1_0/ISchedulingPolicyService.java",
+ interfaces: [
+ "android.hidl.base@1.0",
],
+ gen_java: true,
}
-java_library {
- name: "android.frameworks.schedulerservice-V1.0-java",
- no_framework_libs: true,
- defaults: ["hidl-java-module-defaults"],
- srcs: [":android.frameworks.schedulerservice-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.frameworks.schedulerservice@1.0-adapter-helper_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.frameworks:frameworks/hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.schedulerservice@1.0",
- srcs: [
- ":android.frameworks.schedulerservice@1.0_hal",
- ],
- out: [
- "android/frameworks/schedulerservice/1.0/ASchedulingPolicyService.cpp",
- ],
-}
-
-genrule {
- name: "android.frameworks.schedulerservice@1.0-adapter-helper_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.frameworks:frameworks/hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.schedulerservice@1.0",
- srcs: [
- ":android.frameworks.schedulerservice@1.0_hal",
- ],
- out: [
- "android/frameworks/schedulerservice/1.0/ASchedulingPolicyService.h",
- ],
-}
-
-cc_library {
- name: "android.frameworks.schedulerservice@1.0-adapter-helper",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.frameworks.schedulerservice@1.0-adapter-helper_genc++"],
- generated_headers: ["android.frameworks.schedulerservice@1.0-adapter-helper_genc++_headers"],
- export_generated_headers: ["android.frameworks.schedulerservice@1.0-adapter-helper_genc++_headers"],
- vendor_available: true,
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libhidladapter",
- "android.frameworks.schedulerservice@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "libhidladapter",
- "android.frameworks.schedulerservice@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
-}
-
-genrule {
- name: "android.frameworks.schedulerservice@1.0-adapter_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.frameworks:frameworks/hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.schedulerservice@1.0",
- out: ["main.cpp"]
-}
-
-cc_test {
- name: "android.frameworks.schedulerservice@1.0-adapter",
- defaults: ["hidl-module-defaults"],
- shared_libs: [
- "libhidladapter",
- "libhidlbase",
- "libhidltransport",
- "libutils",
- "android.frameworks.schedulerservice@1.0",
- "android.frameworks.schedulerservice@1.0-adapter-helper",
- ],
- generated_sources: ["android.frameworks.schedulerservice@1.0-adapter_genc++"],
-}
diff --git a/sensorservice/1.0/Android.bp b/sensorservice/1.0/Android.bp
index 7c0b213..0602bfd 100644
--- a/sensorservice/1.0/Android.bp
+++ b/sensorservice/1.0/Android.bp
@@ -1,7 +1,11 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
-filegroup {
- name: "android.frameworks.sensorservice@1.0_hal",
+hidl_interface {
+ name: "android.frameworks.sensorservice@1.0",
+ root: "android.frameworks",
+ vndk: {
+ enabled: true,
+ },
srcs: [
"types.hal",
"IDirectReportChannel.hal",
@@ -9,171 +13,13 @@
"IEventQueueCallback.hal",
"ISensorManager.hal",
],
-}
-
-genrule {
- name: "android.frameworks.sensorservice@1.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.frameworks:frameworks/hardware/interfaces -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.sensorservice@1.0",
- srcs: [
- ":android.frameworks.sensorservice@1.0_hal",
- ],
- out: [
- "android/frameworks/sensorservice/1.0/types.cpp",
- "android/frameworks/sensorservice/1.0/DirectReportChannelAll.cpp",
- "android/frameworks/sensorservice/1.0/EventQueueAll.cpp",
- "android/frameworks/sensorservice/1.0/EventQueueCallbackAll.cpp",
- "android/frameworks/sensorservice/1.0/SensorManagerAll.cpp",
- ],
-}
-
-genrule {
- name: "android.frameworks.sensorservice@1.0_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.frameworks:frameworks/hardware/interfaces -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.sensorservice@1.0",
- srcs: [
- ":android.frameworks.sensorservice@1.0_hal",
- ],
- out: [
- "android/frameworks/sensorservice/1.0/types.h",
- "android/frameworks/sensorservice/1.0/hwtypes.h",
- "android/frameworks/sensorservice/1.0/IDirectReportChannel.h",
- "android/frameworks/sensorservice/1.0/IHwDirectReportChannel.h",
- "android/frameworks/sensorservice/1.0/BnHwDirectReportChannel.h",
- "android/frameworks/sensorservice/1.0/BpHwDirectReportChannel.h",
- "android/frameworks/sensorservice/1.0/BsDirectReportChannel.h",
- "android/frameworks/sensorservice/1.0/IEventQueue.h",
- "android/frameworks/sensorservice/1.0/IHwEventQueue.h",
- "android/frameworks/sensorservice/1.0/BnHwEventQueue.h",
- "android/frameworks/sensorservice/1.0/BpHwEventQueue.h",
- "android/frameworks/sensorservice/1.0/BsEventQueue.h",
- "android/frameworks/sensorservice/1.0/IEventQueueCallback.h",
- "android/frameworks/sensorservice/1.0/IHwEventQueueCallback.h",
- "android/frameworks/sensorservice/1.0/BnHwEventQueueCallback.h",
- "android/frameworks/sensorservice/1.0/BpHwEventQueueCallback.h",
- "android/frameworks/sensorservice/1.0/BsEventQueueCallback.h",
- "android/frameworks/sensorservice/1.0/ISensorManager.h",
- "android/frameworks/sensorservice/1.0/IHwSensorManager.h",
- "android/frameworks/sensorservice/1.0/BnHwSensorManager.h",
- "android/frameworks/sensorservice/1.0/BpHwSensorManager.h",
- "android/frameworks/sensorservice/1.0/BsSensorManager.h",
- ],
-}
-
-cc_library {
- name: "android.frameworks.sensorservice@1.0",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.frameworks.sensorservice@1.0_genc++"],
- generated_headers: ["android.frameworks.sensorservice@1.0_genc++_headers"],
- export_generated_headers: ["android.frameworks.sensorservice@1.0_genc++_headers"],
- vendor_available: true,
- vndk: {
- enabled: true,
- },
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
+ interfaces: [
"android.hardware.sensors@1.0",
+ "android.hidl.base@1.0",
],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hardware.sensors@1.0",
+ types: [
+ "Result",
],
+ gen_java: false,
}
-// 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.frameworks.sensorservice@1.0-adapter-helper_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.frameworks:frameworks/hardware/interfaces -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.sensorservice@1.0",
- srcs: [
- ":android.frameworks.sensorservice@1.0_hal",
- ],
- out: [
- "android/frameworks/sensorservice/1.0/ADirectReportChannel.cpp",
- "android/frameworks/sensorservice/1.0/AEventQueue.cpp",
- "android/frameworks/sensorservice/1.0/AEventQueueCallback.cpp",
- "android/frameworks/sensorservice/1.0/ASensorManager.cpp",
- ],
-}
-
-genrule {
- name: "android.frameworks.sensorservice@1.0-adapter-helper_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.frameworks:frameworks/hardware/interfaces -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.sensorservice@1.0",
- srcs: [
- ":android.frameworks.sensorservice@1.0_hal",
- ],
- out: [
- "android/frameworks/sensorservice/1.0/ADirectReportChannel.h",
- "android/frameworks/sensorservice/1.0/AEventQueue.h",
- "android/frameworks/sensorservice/1.0/AEventQueueCallback.h",
- "android/frameworks/sensorservice/1.0/ASensorManager.h",
- ],
-}
-
-cc_library {
- name: "android.frameworks.sensorservice@1.0-adapter-helper",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.frameworks.sensorservice@1.0-adapter-helper_genc++"],
- generated_headers: ["android.frameworks.sensorservice@1.0-adapter-helper_genc++_headers"],
- export_generated_headers: ["android.frameworks.sensorservice@1.0-adapter-helper_genc++_headers"],
- vendor_available: true,
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libhidladapter",
- "android.frameworks.sensorservice@1.0",
- "android.hardware.sensors@1.0",
- "android.hardware.sensors@1.0-adapter-helper",
- "android.hidl.base@1.0-adapter-helper",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "libhidladapter",
- "android.frameworks.sensorservice@1.0",
- "android.hardware.sensors@1.0",
- "android.hardware.sensors@1.0-adapter-helper",
- "android.hidl.base@1.0-adapter-helper",
- ],
-}
-
-genrule {
- name: "android.frameworks.sensorservice@1.0-adapter_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.frameworks:frameworks/hardware/interfaces -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.sensorservice@1.0",
- out: ["main.cpp"]
-}
-
-cc_test {
- name: "android.frameworks.sensorservice@1.0-adapter",
- defaults: ["hidl-module-defaults"],
- shared_libs: [
- "libhidladapter",
- "libhidlbase",
- "libhidltransport",
- "libutils",
- "android.frameworks.sensorservice@1.0",
- "android.hardware.sensors@1.0",
- "android.frameworks.sensorservice@1.0-adapter-helper",
- ],
- generated_sources: ["android.frameworks.sensorservice@1.0-adapter_genc++"],
-}
diff --git a/vr/composer/1.0/Android.bp b/vr/composer/1.0/Android.bp
index 4fcf65a..dc7c2fa 100644
--- a/vr/composer/1.0/Android.bp
+++ b/vr/composer/1.0/Android.bp
@@ -1,153 +1,19 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
-filegroup {
- name: "android.frameworks.vr.composer@1.0_hal",
- srcs: [
- "IVrComposerClient.hal",
- ],
-}
-
-genrule {
- name: "android.frameworks.vr.composer@1.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.frameworks:frameworks/hardware/interfaces -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.vr.composer@1.0",
- srcs: [
- ":android.frameworks.vr.composer@1.0_hal",
- ],
- out: [
- "android/frameworks/vr/composer/1.0/VrComposerClientAll.cpp",
- ],
-}
-
-genrule {
- name: "android.frameworks.vr.composer@1.0_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.frameworks:frameworks/hardware/interfaces -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.vr.composer@1.0",
- srcs: [
- ":android.frameworks.vr.composer@1.0_hal",
- ],
- out: [
- "android/frameworks/vr/composer/1.0/IVrComposerClient.h",
- "android/frameworks/vr/composer/1.0/IHwVrComposerClient.h",
- "android/frameworks/vr/composer/1.0/BnHwVrComposerClient.h",
- "android/frameworks/vr/composer/1.0/BpHwVrComposerClient.h",
- "android/frameworks/vr/composer/1.0/BsVrComposerClient.h",
- ],
-}
-
-cc_library {
+hidl_interface {
name: "android.frameworks.vr.composer@1.0",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.frameworks.vr.composer@1.0_genc++"],
- generated_headers: ["android.frameworks.vr.composer@1.0_genc++_headers"],
- export_generated_headers: ["android.frameworks.vr.composer@1.0_genc++_headers"],
- vendor_available: true,
+ root: "android.frameworks",
vndk: {
enabled: true,
},
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "android.hardware.graphics.common@1.0",
- "android.hardware.graphics.composer@2.1",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hardware.graphics.common@1.0",
- "android.hardware.graphics.composer@2.1",
- ],
-}
-
-// 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.frameworks.vr.composer@1.0-adapter-helper_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.frameworks:frameworks/hardware/interfaces -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.vr.composer@1.0",
srcs: [
- ":android.frameworks.vr.composer@1.0_hal",
+ "IVrComposerClient.hal",
],
- out: [
- "android/frameworks/vr/composer/1.0/AVrComposerClient.cpp",
- ],
-}
-
-genrule {
- name: "android.frameworks.vr.composer@1.0-adapter-helper_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.frameworks:frameworks/hardware/interfaces -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.vr.composer@1.0",
- srcs: [
- ":android.frameworks.vr.composer@1.0_hal",
- ],
- out: [
- "android/frameworks/vr/composer/1.0/AVrComposerClient.h",
- ],
-}
-
-cc_library {
- name: "android.frameworks.vr.composer@1.0-adapter-helper",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.frameworks.vr.composer@1.0-adapter-helper_genc++"],
- generated_headers: ["android.frameworks.vr.composer@1.0-adapter-helper_genc++_headers"],
- export_generated_headers: ["android.frameworks.vr.composer@1.0-adapter-helper_genc++_headers"],
- vendor_available: true,
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libhidladapter",
- "android.frameworks.vr.composer@1.0",
+ interfaces: [
"android.hardware.graphics.common@1.0",
"android.hardware.graphics.composer@2.1",
- "android.hardware.graphics.composer@2.1-adapter-helper",
- "android.hidl.base@1.0-adapter-helper",
+ "android.hidl.base@1.0",
],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "libhidladapter",
- "android.frameworks.vr.composer@1.0",
- "android.hardware.graphics.common@1.0",
- "android.hardware.graphics.composer@2.1",
- "android.hardware.graphics.composer@2.1-adapter-helper",
- "android.hidl.base@1.0-adapter-helper",
- ],
+ gen_java: false,
}
-genrule {
- name: "android.frameworks.vr.composer@1.0-adapter_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.frameworks:frameworks/hardware/interfaces -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.vr.composer@1.0",
- out: ["main.cpp"]
-}
-
-cc_test {
- name: "android.frameworks.vr.composer@1.0-adapter",
- defaults: ["hidl-module-defaults"],
- shared_libs: [
- "libhidladapter",
- "libhidlbase",
- "libhidltransport",
- "libutils",
- "android.frameworks.vr.composer@1.0",
- "android.hardware.graphics.common@1.0",
- "android.hardware.graphics.composer@2.1",
- "android.frameworks.vr.composer@1.0-adapter-helper",
- ],
- generated_sources: ["android.frameworks.vr.composer@1.0-adapter_genc++"],
-}
