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.
diff --git a/camera/device/1.0/Android.bp b/camera/device/1.0/Android.bp
index f19aae9..dbf2a10 100644
--- a/camera/device/1.0/Android.bp
+++ b/camera/device/1.0/Android.bp
@@ -1,173 +1,34 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
-filegroup {
- name: "android.hardware.camera.device@1.0_hal",
+hidl_interface {
+ name: "android.hardware.camera.device@1.0",
+ root: "android.hardware",
+ vndk: {
+ enabled: true,
+ },
srcs: [
"types.hal",
"ICameraDevice.hal",
"ICameraDeviceCallback.hal",
"ICameraDevicePreviewCallback.hal",
],
-}
-
-genrule {
- name: "android.hardware.camera.device@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.device@1.0",
- srcs: [
- ":android.hardware.camera.device@1.0_hal",
- ],
- out: [
- "android/hardware/camera/device/1.0/types.cpp",
- "android/hardware/camera/device/1.0/CameraDeviceAll.cpp",
- "android/hardware/camera/device/1.0/CameraDeviceCallbackAll.cpp",
- "android/hardware/camera/device/1.0/CameraDevicePreviewCallbackAll.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.camera.device@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.device@1.0",
- srcs: [
- ":android.hardware.camera.device@1.0_hal",
- ],
- out: [
- "android/hardware/camera/device/1.0/types.h",
- "android/hardware/camera/device/1.0/hwtypes.h",
- "android/hardware/camera/device/1.0/ICameraDevice.h",
- "android/hardware/camera/device/1.0/IHwCameraDevice.h",
- "android/hardware/camera/device/1.0/BnHwCameraDevice.h",
- "android/hardware/camera/device/1.0/BpHwCameraDevice.h",
- "android/hardware/camera/device/1.0/BsCameraDevice.h",
- "android/hardware/camera/device/1.0/ICameraDeviceCallback.h",
- "android/hardware/camera/device/1.0/IHwCameraDeviceCallback.h",
- "android/hardware/camera/device/1.0/BnHwCameraDeviceCallback.h",
- "android/hardware/camera/device/1.0/BpHwCameraDeviceCallback.h",
- "android/hardware/camera/device/1.0/BsCameraDeviceCallback.h",
- "android/hardware/camera/device/1.0/ICameraDevicePreviewCallback.h",
- "android/hardware/camera/device/1.0/IHwCameraDevicePreviewCallback.h",
- "android/hardware/camera/device/1.0/BnHwCameraDevicePreviewCallback.h",
- "android/hardware/camera/device/1.0/BpHwCameraDevicePreviewCallback.h",
- "android/hardware/camera/device/1.0/BsCameraDevicePreviewCallback.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.camera.device@1.0",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.camera.device@1.0_genc++"],
- generated_headers: ["android.hardware.camera.device@1.0_genc++_headers"],
- export_generated_headers: ["android.hardware.camera.device@1.0_genc++_headers"],
- vendor_available: true,
- vndk: {
- enabled: true,
- },
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
+ interfaces: [
"android.hardware.camera.common@1.0",
"android.hardware.graphics.common@1.0",
+ "android.hidl.base@1.0",
],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hardware.camera.common@1.0",
- "android.hardware.graphics.common@1.0",
+ types: [
+ "CameraFace",
+ "CameraFacing",
+ "CameraFrameMetadata",
+ "CameraInfo",
+ "CommandType",
+ "DataCallbackMsg",
+ "FrameCallbackFlag",
+ "HandleTimestampMessage",
+ "NotifyCallbackMsg",
+ "VideoFrameMessage",
],
+ 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.hardware.camera.device@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.camera.device@1.0",
- srcs: [
- ":android.hardware.camera.device@1.0_hal",
- ],
- out: [
- "android/hardware/camera/device/1.0/ACameraDevice.cpp",
- "android/hardware/camera/device/1.0/ACameraDeviceCallback.cpp",
- "android/hardware/camera/device/1.0/ACameraDevicePreviewCallback.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.camera.device@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.camera.device@1.0",
- srcs: [
- ":android.hardware.camera.device@1.0_hal",
- ],
- out: [
- "android/hardware/camera/device/1.0/ACameraDevice.h",
- "android/hardware/camera/device/1.0/ACameraDeviceCallback.h",
- "android/hardware/camera/device/1.0/ACameraDevicePreviewCallback.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.camera.device@1.0-adapter-helper",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.camera.device@1.0-adapter-helper_genc++"],
- generated_headers: ["android.hardware.camera.device@1.0-adapter-helper_genc++_headers"],
- export_generated_headers: ["android.hardware.camera.device@1.0-adapter-helper_genc++_headers"],
- vendor_available: true,
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libhidladapter",
- "android.hardware.camera.common@1.0",
- "android.hardware.camera.device@1.0",
- "android.hardware.graphics.common@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "libhidladapter",
- "android.hardware.camera.common@1.0",
- "android.hardware.camera.device@1.0",
- "android.hardware.graphics.common@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
-}
-
-genrule {
- name: "android.hardware.camera.device@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.camera.device@1.0",
- out: ["main.cpp"]
-}
-
-cc_test {
- name: "android.hardware.camera.device@1.0-adapter",
- defaults: ["hidl-module-defaults"],
- shared_libs: [
- "libhidladapter",
- "libhidlbase",
- "libhidltransport",
- "libutils",
- "android.hardware.camera.common@1.0",
- "android.hardware.camera.device@1.0",
- "android.hardware.graphics.common@1.0",
- "android.hardware.camera.device@1.0-adapter-helper",
- ],
- generated_sources: ["android.hardware.camera.device@1.0-adapter_genc++"],
-}
diff --git a/camera/device/3.2/Android.bp b/camera/device/3.2/Android.bp
index 0dcbdb4..a8a164e 100644
--- a/camera/device/3.2/Android.bp
+++ b/camera/device/3.2/Android.bp
@@ -1,173 +1,44 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
-filegroup {
- name: "android.hardware.camera.device@3.2_hal",
+hidl_interface {
+ name: "android.hardware.camera.device@3.2",
+ root: "android.hardware",
+ vndk: {
+ enabled: true,
+ },
srcs: [
"types.hal",
"ICameraDevice.hal",
"ICameraDeviceCallback.hal",
"ICameraDeviceSession.hal",
],
-}
-
-genrule {
- name: "android.hardware.camera.device@3.2_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.2",
- srcs: [
- ":android.hardware.camera.device@3.2_hal",
- ],
- out: [
- "android/hardware/camera/device/3.2/types.cpp",
- "android/hardware/camera/device/3.2/CameraDeviceAll.cpp",
- "android/hardware/camera/device/3.2/CameraDeviceCallbackAll.cpp",
- "android/hardware/camera/device/3.2/CameraDeviceSessionAll.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.camera.device@3.2_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.device@3.2",
- srcs: [
- ":android.hardware.camera.device@3.2_hal",
- ],
- out: [
- "android/hardware/camera/device/3.2/types.h",
- "android/hardware/camera/device/3.2/hwtypes.h",
- "android/hardware/camera/device/3.2/ICameraDevice.h",
- "android/hardware/camera/device/3.2/IHwCameraDevice.h",
- "android/hardware/camera/device/3.2/BnHwCameraDevice.h",
- "android/hardware/camera/device/3.2/BpHwCameraDevice.h",
- "android/hardware/camera/device/3.2/BsCameraDevice.h",
- "android/hardware/camera/device/3.2/ICameraDeviceCallback.h",
- "android/hardware/camera/device/3.2/IHwCameraDeviceCallback.h",
- "android/hardware/camera/device/3.2/BnHwCameraDeviceCallback.h",
- "android/hardware/camera/device/3.2/BpHwCameraDeviceCallback.h",
- "android/hardware/camera/device/3.2/BsCameraDeviceCallback.h",
- "android/hardware/camera/device/3.2/ICameraDeviceSession.h",
- "android/hardware/camera/device/3.2/IHwCameraDeviceSession.h",
- "android/hardware/camera/device/3.2/BnHwCameraDeviceSession.h",
- "android/hardware/camera/device/3.2/BpHwCameraDeviceSession.h",
- "android/hardware/camera/device/3.2/BsCameraDeviceSession.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.camera.device@3.2",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.camera.device@3.2_genc++"],
- generated_headers: ["android.hardware.camera.device@3.2_genc++_headers"],
- export_generated_headers: ["android.hardware.camera.device@3.2_genc++_headers"],
- vendor_available: true,
- vndk: {
- enabled: true,
- },
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
+ interfaces: [
"android.hardware.camera.common@1.0",
"android.hardware.graphics.common@1.0",
+ "android.hidl.base@1.0",
],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hardware.camera.common@1.0",
- "android.hardware.graphics.common@1.0",
+ types: [
+ "BufferCache",
+ "BufferStatus",
+ "CameraBlob",
+ "CameraBlobId",
+ "CaptureRequest",
+ "CaptureResult",
+ "ErrorCode",
+ "ErrorMsg",
+ "HalStream",
+ "HalStreamConfiguration",
+ "MsgType",
+ "NotifyMsg",
+ "RequestTemplate",
+ "ShutterMsg",
+ "Stream",
+ "StreamBuffer",
+ "StreamConfiguration",
+ "StreamConfigurationMode",
+ "StreamRotation",
+ "StreamType",
],
+ 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.hardware.camera.device@3.2-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.camera.device@3.2",
- srcs: [
- ":android.hardware.camera.device@3.2_hal",
- ],
- out: [
- "android/hardware/camera/device/3.2/ACameraDevice.cpp",
- "android/hardware/camera/device/3.2/ACameraDeviceCallback.cpp",
- "android/hardware/camera/device/3.2/ACameraDeviceSession.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.camera.device@3.2-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.camera.device@3.2",
- srcs: [
- ":android.hardware.camera.device@3.2_hal",
- ],
- out: [
- "android/hardware/camera/device/3.2/ACameraDevice.h",
- "android/hardware/camera/device/3.2/ACameraDeviceCallback.h",
- "android/hardware/camera/device/3.2/ACameraDeviceSession.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.camera.device@3.2-adapter-helper",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.camera.device@3.2-adapter-helper_genc++"],
- generated_headers: ["android.hardware.camera.device@3.2-adapter-helper_genc++_headers"],
- export_generated_headers: ["android.hardware.camera.device@3.2-adapter-helper_genc++_headers"],
- vendor_available: true,
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libhidladapter",
- "android.hardware.camera.common@1.0",
- "android.hardware.camera.device@3.2",
- "android.hardware.graphics.common@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "libhidladapter",
- "android.hardware.camera.common@1.0",
- "android.hardware.camera.device@3.2",
- "android.hardware.graphics.common@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
-}
-
-genrule {
- name: "android.hardware.camera.device@3.2-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.camera.device@3.2",
- out: ["main.cpp"]
-}
-
-cc_test {
- name: "android.hardware.camera.device@3.2-adapter",
- defaults: ["hidl-module-defaults"],
- shared_libs: [
- "libhidladapter",
- "libhidlbase",
- "libhidltransport",
- "libutils",
- "android.hardware.camera.common@1.0",
- "android.hardware.camera.device@3.2",
- "android.hardware.graphics.common@1.0",
- "android.hardware.camera.device@3.2-adapter-helper",
- ],
- generated_sources: ["android.hardware.camera.device@3.2-adapter_genc++"],
-}
diff --git a/camera/metadata/3.2/Android.bp b/camera/metadata/3.2/Android.bp
index 455a271..bce2c9b 100644
--- a/camera/metadata/3.2/Android.bp
+++ b/camera/metadata/3.2/Android.bp
@@ -1,148 +1,80 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
-filegroup {
- name: "android.hardware.camera.metadata@3.2_hal",
- srcs: [
- "types.hal",
- ],
-}
-
-genrule {
- name: "android.hardware.camera.metadata@3.2_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.metadata@3.2",
- srcs: [
- ":android.hardware.camera.metadata@3.2_hal",
- ],
- out: [
- "android/hardware/camera/metadata/3.2/types.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.camera.metadata@3.2_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.metadata@3.2",
- srcs: [
- ":android.hardware.camera.metadata@3.2_hal",
- ],
- out: [
- "android/hardware/camera/metadata/3.2/types.h",
- "android/hardware/camera/metadata/3.2/hwtypes.h",
- ],
-}
-
-cc_library {
+hidl_interface {
name: "android.hardware.camera.metadata@3.2",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.camera.metadata@3.2_genc++"],
- generated_headers: ["android.hardware.camera.metadata@3.2_genc++_headers"],
- export_generated_headers: ["android.hardware.camera.metadata@3.2_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.metadata-V3.2-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.metadata@3.2",
srcs: [
- ":android.hardware.camera.metadata@3.2_hal",
+ "types.hal",
],
- out: [
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidBlackLevelLock.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidColorCorrectionAberrationMode.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidColorCorrectionMode.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlAeAntibandingMode.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlAeLock.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlAeLockAvailable.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlAeMode.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlAePrecaptureTrigger.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlAeState.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlAfMode.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlAfState.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlAfTrigger.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlAwbLock.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlAwbLockAvailable.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlAwbMode.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlAwbState.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlCaptureIntent.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlEffectMode.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlEnableZsl.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlMode.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlSceneMode.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlVideoStabilizationMode.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidDemosaicMode.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidDepthAvailableDepthStreamConfigurations.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidDepthDepthIsExclusive.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidEdgeMode.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidFlashInfoAvailable.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidFlashMode.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidFlashState.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidHotPixelMode.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidInfoSupportedHardwareLevel.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidLedAvailableLeds.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidLedTransmit.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidLensFacing.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidLensInfoFocusDistanceCalibration.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidLensOpticalStabilizationMode.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidLensState.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidNoiseReductionMode.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidQuirksPartialResult.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidRequestAvailableCapabilities.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidRequestMetadataMode.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidRequestType.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidScalerAvailableFormats.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidScalerAvailableStreamConfigurations.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidScalerCroppingType.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidSensorInfoColorFilterArrangement.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidSensorInfoLensShadingApplied.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidSensorInfoTimestampSource.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidSensorReferenceIlluminant1.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidSensorTestPatternMode.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidShadingMode.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidStatisticsFaceDetectMode.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidStatisticsHistogramMode.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidStatisticsHotPixelMapMode.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidStatisticsLensShadingMapMode.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidStatisticsSceneFlicker.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidStatisticsSharpnessMapMode.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidSyncFrameNumber.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidSyncMaxLatency.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidTonemapMode.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidTonemapPresetCurve.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataSection.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataSectionStart.java",
- "android/hardware/camera/metadata/V3_2/CameraMetadataTag.java",
+ types: [
+ "CameraMetadataEnumAndroidBlackLevelLock",
+ "CameraMetadataEnumAndroidColorCorrectionAberrationMode",
+ "CameraMetadataEnumAndroidColorCorrectionMode",
+ "CameraMetadataEnumAndroidControlAeAntibandingMode",
+ "CameraMetadataEnumAndroidControlAeLock",
+ "CameraMetadataEnumAndroidControlAeLockAvailable",
+ "CameraMetadataEnumAndroidControlAeMode",
+ "CameraMetadataEnumAndroidControlAePrecaptureTrigger",
+ "CameraMetadataEnumAndroidControlAeState",
+ "CameraMetadataEnumAndroidControlAfMode",
+ "CameraMetadataEnumAndroidControlAfState",
+ "CameraMetadataEnumAndroidControlAfTrigger",
+ "CameraMetadataEnumAndroidControlAwbLock",
+ "CameraMetadataEnumAndroidControlAwbLockAvailable",
+ "CameraMetadataEnumAndroidControlAwbMode",
+ "CameraMetadataEnumAndroidControlAwbState",
+ "CameraMetadataEnumAndroidControlCaptureIntent",
+ "CameraMetadataEnumAndroidControlEffectMode",
+ "CameraMetadataEnumAndroidControlEnableZsl",
+ "CameraMetadataEnumAndroidControlMode",
+ "CameraMetadataEnumAndroidControlSceneMode",
+ "CameraMetadataEnumAndroidControlVideoStabilizationMode",
+ "CameraMetadataEnumAndroidDemosaicMode",
+ "CameraMetadataEnumAndroidDepthAvailableDepthStreamConfigurations",
+ "CameraMetadataEnumAndroidDepthDepthIsExclusive",
+ "CameraMetadataEnumAndroidEdgeMode",
+ "CameraMetadataEnumAndroidFlashInfoAvailable",
+ "CameraMetadataEnumAndroidFlashMode",
+ "CameraMetadataEnumAndroidFlashState",
+ "CameraMetadataEnumAndroidHotPixelMode",
+ "CameraMetadataEnumAndroidInfoSupportedHardwareLevel",
+ "CameraMetadataEnumAndroidLedAvailableLeds",
+ "CameraMetadataEnumAndroidLedTransmit",
+ "CameraMetadataEnumAndroidLensFacing",
+ "CameraMetadataEnumAndroidLensInfoFocusDistanceCalibration",
+ "CameraMetadataEnumAndroidLensOpticalStabilizationMode",
+ "CameraMetadataEnumAndroidLensState",
+ "CameraMetadataEnumAndroidNoiseReductionMode",
+ "CameraMetadataEnumAndroidQuirksPartialResult",
+ "CameraMetadataEnumAndroidRequestAvailableCapabilities",
+ "CameraMetadataEnumAndroidRequestMetadataMode",
+ "CameraMetadataEnumAndroidRequestType",
+ "CameraMetadataEnumAndroidScalerAvailableFormats",
+ "CameraMetadataEnumAndroidScalerAvailableStreamConfigurations",
+ "CameraMetadataEnumAndroidScalerCroppingType",
+ "CameraMetadataEnumAndroidSensorInfoColorFilterArrangement",
+ "CameraMetadataEnumAndroidSensorInfoLensShadingApplied",
+ "CameraMetadataEnumAndroidSensorInfoTimestampSource",
+ "CameraMetadataEnumAndroidSensorReferenceIlluminant1",
+ "CameraMetadataEnumAndroidSensorTestPatternMode",
+ "CameraMetadataEnumAndroidShadingMode",
+ "CameraMetadataEnumAndroidStatisticsFaceDetectMode",
+ "CameraMetadataEnumAndroidStatisticsHistogramMode",
+ "CameraMetadataEnumAndroidStatisticsHotPixelMapMode",
+ "CameraMetadataEnumAndroidStatisticsLensShadingMapMode",
+ "CameraMetadataEnumAndroidStatisticsSceneFlicker",
+ "CameraMetadataEnumAndroidStatisticsSharpnessMapMode",
+ "CameraMetadataEnumAndroidSyncFrameNumber",
+ "CameraMetadataEnumAndroidSyncMaxLatency",
+ "CameraMetadataEnumAndroidTonemapMode",
+ "CameraMetadataEnumAndroidTonemapPresetCurve",
+ "CameraMetadataSection",
+ "CameraMetadataSectionStart",
+ "CameraMetadataTag",
],
+ gen_java: true,
}
-java_library {
- name: "android.hardware.camera.metadata-V3.2-java",
- no_framework_libs: true,
- defaults: ["hidl-java-module-defaults"],
- srcs: [":android.hardware.camera.metadata-V3.2-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.
diff --git a/camera/provider/2.4/Android.bp b/camera/provider/2.4/Android.bp
index 3aa8d8b..7139ad0 100644
--- a/camera/provider/2.4/Android.bp
+++ b/camera/provider/2.4/Android.bp
@@ -1,169 +1,22 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
-filegroup {
- name: "android.hardware.camera.provider@2.4_hal",
+hidl_interface {
+ name: "android.hardware.camera.provider@2.4",
+ root: "android.hardware",
+ vndk: {
+ enabled: true,
+ },
srcs: [
"ICameraProvider.hal",
"ICameraProviderCallback.hal",
],
-}
-
-genrule {
- name: "android.hardware.camera.provider@2.4_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.provider@2.4",
- srcs: [
- ":android.hardware.camera.provider@2.4_hal",
- ],
- out: [
- "android/hardware/camera/provider/2.4/CameraProviderAll.cpp",
- "android/hardware/camera/provider/2.4/CameraProviderCallbackAll.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.camera.provider@2.4_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.provider@2.4",
- srcs: [
- ":android.hardware.camera.provider@2.4_hal",
- ],
- out: [
- "android/hardware/camera/provider/2.4/ICameraProvider.h",
- "android/hardware/camera/provider/2.4/IHwCameraProvider.h",
- "android/hardware/camera/provider/2.4/BnHwCameraProvider.h",
- "android/hardware/camera/provider/2.4/BpHwCameraProvider.h",
- "android/hardware/camera/provider/2.4/BsCameraProvider.h",
- "android/hardware/camera/provider/2.4/ICameraProviderCallback.h",
- "android/hardware/camera/provider/2.4/IHwCameraProviderCallback.h",
- "android/hardware/camera/provider/2.4/BnHwCameraProviderCallback.h",
- "android/hardware/camera/provider/2.4/BpHwCameraProviderCallback.h",
- "android/hardware/camera/provider/2.4/BsCameraProviderCallback.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.camera.provider@2.4",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.camera.provider@2.4_genc++"],
- generated_headers: ["android.hardware.camera.provider@2.4_genc++_headers"],
- export_generated_headers: ["android.hardware.camera.provider@2.4_genc++_headers"],
- vendor_available: true,
- vndk: {
- enabled: true,
- },
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
+ interfaces: [
"android.hardware.camera.common@1.0",
"android.hardware.camera.device@1.0",
"android.hardware.camera.device@3.2",
+ "android.hardware.graphics.common@1.0",
+ "android.hidl.base@1.0",
],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hardware.camera.common@1.0",
- "android.hardware.camera.device@1.0",
- "android.hardware.camera.device@3.2",
- ],
+ 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.hardware.camera.provider@2.4-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.camera.provider@2.4",
- srcs: [
- ":android.hardware.camera.provider@2.4_hal",
- ],
- out: [
- "android/hardware/camera/provider/2.4/ACameraProvider.cpp",
- "android/hardware/camera/provider/2.4/ACameraProviderCallback.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.camera.provider@2.4-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.camera.provider@2.4",
- srcs: [
- ":android.hardware.camera.provider@2.4_hal",
- ],
- out: [
- "android/hardware/camera/provider/2.4/ACameraProvider.h",
- "android/hardware/camera/provider/2.4/ACameraProviderCallback.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.camera.provider@2.4-adapter-helper",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.camera.provider@2.4-adapter-helper_genc++"],
- generated_headers: ["android.hardware.camera.provider@2.4-adapter-helper_genc++_headers"],
- export_generated_headers: ["android.hardware.camera.provider@2.4-adapter-helper_genc++_headers"],
- vendor_available: true,
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libhidladapter",
- "android.hardware.camera.common@1.0",
- "android.hardware.camera.device@1.0",
- "android.hardware.camera.device@3.2",
- "android.hardware.camera.provider@2.4",
- "android.hardware.camera.device@1.0-adapter-helper",
- "android.hardware.camera.device@3.2-adapter-helper",
- "android.hidl.base@1.0-adapter-helper",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "libhidladapter",
- "android.hardware.camera.common@1.0",
- "android.hardware.camera.device@1.0",
- "android.hardware.camera.device@3.2",
- "android.hardware.camera.provider@2.4",
- "android.hardware.camera.device@1.0-adapter-helper",
- "android.hardware.camera.device@3.2-adapter-helper",
- "android.hidl.base@1.0-adapter-helper",
- ],
-}
-
-genrule {
- name: "android.hardware.camera.provider@2.4-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.camera.provider@2.4",
- out: ["main.cpp"]
-}
-
-cc_test {
- name: "android.hardware.camera.provider@2.4-adapter",
- defaults: ["hidl-module-defaults"],
- shared_libs: [
- "libhidladapter",
- "libhidlbase",
- "libhidltransport",
- "libutils",
- "android.hardware.camera.common@1.0",
- "android.hardware.camera.device@1.0",
- "android.hardware.camera.device@3.2",
- "android.hardware.camera.provider@2.4",
- "android.hardware.camera.provider@2.4-adapter-helper",
- ],
- generated_sources: ["android.hardware.camera.provider@2.4-adapter_genc++"],
-}