Update makefiles for hidl_interface.
Bug: 35570956
Test: manual
Change-Id: I7a220b78ee081240e1dc30ef5672ba39e3e98375
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.