Update makefiles for hidl_interface.
Bug: 35570956
Test: manual
Change-Id: I7a220b78ee081240e1dc30ef5672ba39e3e98375
diff --git a/camera/common/1.0/Android.bp b/camera/common/1.0/Android.bp
index 8a553e2..c42e054 100644
--- a/camera/common/1.0/Android.bp
+++ b/camera/common/1.0/Android.bp
@@ -1,93 +1,25 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
-filegroup {
- name: "android.hardware.camera.common@1.0_hal",
- srcs: [
- "types.hal",
- ],
-}
-
-genrule {
- name: "android.hardware.camera.common@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.camera.common@1.0",
- srcs: [
- ":android.hardware.camera.common@1.0_hal",
- ],
- out: [
- "android/hardware/camera/common/1.0/types.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.camera.common@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.camera.common@1.0",
- srcs: [
- ":android.hardware.camera.common@1.0_hal",
- ],
- out: [
- "android/hardware/camera/common/1.0/types.h",
- "android/hardware/camera/common/1.0/hwtypes.h",
- ],
-}
-
-cc_library {
+hidl_interface {
name: "android.hardware.camera.common@1.0",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.camera.common@1.0_genc++"],
- generated_headers: ["android.hardware.camera.common@1.0_genc++_headers"],
- export_generated_headers: ["android.hardware.camera.common@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.camera.common-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.camera.common@1.0",
srcs: [
- ":android.hardware.camera.common@1.0_hal",
+ "types.hal",
],
- out: [
- "android/hardware/camera/common/V1_0/CameraDeviceStatus.java",
- "android/hardware/camera/common/V1_0/CameraMetadataType.java",
- "android/hardware/camera/common/V1_0/CameraResourceCost.java",
- "android/hardware/camera/common/V1_0/Status.java",
- "android/hardware/camera/common/V1_0/TagBoundaryId.java",
- "android/hardware/camera/common/V1_0/TorchMode.java",
- "android/hardware/camera/common/V1_0/TorchModeStatus.java",
- "android/hardware/camera/common/V1_0/VendorTag.java",
- "android/hardware/camera/common/V1_0/VendorTagSection.java",
+ types: [
+ "CameraDeviceStatus",
+ "CameraMetadataType",
+ "CameraResourceCost",
+ "Status",
+ "TagBoundaryId",
+ "TorchMode",
+ "TorchModeStatus",
+ "VendorTag",
+ "VendorTagSection",
],
+ gen_java: true,
}
-java_library {
- name: "android.hardware.camera.common-V1.0-java",
- no_framework_libs: true,
- defaults: ["hidl-java-module-defaults"],
- srcs: [":android.hardware.camera.common-V1.0-java_gen_java"],
- libs: [
- "hwbinder",
- ]
-}
-
-// This package does not export any types. Not creating java constants export.
-
-// This package has no interfaces. Not creating versioning adapter.