From f8a47b7f01a521564149c43dc25bb3158b52ea09 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Mon, 11 Feb 2019 21:14:16 -0800 Subject: [PATCH] Update makefiles. Bug: 123976090 Test: N/A Change-Id: I5fb6c126a090a3fe0fa4829ea9224564133dc1ae --- audio/5.0/Android.bp | 1 + biometrics/face/1.0/Android.bp | 1 + bluetooth/audio/2.0/Android.bp | 1 + camera/device/3.5/Android.bp | 2 ++ camera/metadata/3.4/Android.bp | 6 ++++++ drm/1.2/Android.bp | 1 + graphics/common/1.2/Android.bp | 3 +++ input/common/1.0/Android.bp | 3 --- neuralnetworks/1.2/Android.bp | 1 + sensors/2.0/Android.bp | 1 + wifi/1.3/Android.bp | 6 +++--- wifi/supplicant/1.2/Android.bp | 8 ++++---- 12 files changed, 24 insertions(+), 10 deletions(-) diff --git a/audio/5.0/Android.bp b/audio/5.0/Android.bp index 3586b8e308..7c2db1d8a9 100644 --- a/audio/5.0/Android.bp +++ b/audio/5.0/Android.bp @@ -30,6 +30,7 @@ hidl_interface { "AudioMicrophoneDirectionality", "AudioMicrophoneLocation", "MessageQueueFlagBits", + "MicrophoneDirection", "MicrophoneInfo", "MmapBufferFlag", "MmapBufferInfo", diff --git a/biometrics/face/1.0/Android.bp b/biometrics/face/1.0/Android.bp index 45dbad9d3a..0f8c6e646b 100644 --- a/biometrics/face/1.0/Android.bp +++ b/biometrics/face/1.0/Android.bp @@ -17,6 +17,7 @@ hidl_interface { types: [ "FaceAcquiredInfo", "FaceError", + "Feature", "OptionalBool", "OptionalUint64", "Status", diff --git a/bluetooth/audio/2.0/Android.bp b/bluetooth/audio/2.0/Android.bp index 542c812590..e72b6ab9fd 100644 --- a/bluetooth/audio/2.0/Android.bp +++ b/bluetooth/audio/2.0/Android.bp @@ -15,6 +15,7 @@ hidl_interface { interfaces: [ "android.hardware.audio.common@5.0", "android.hidl.base@1.0", + "android.hidl.safe_union@1.0", ], types: [ "AacObjectType", diff --git a/camera/device/3.5/Android.bp b/camera/device/3.5/Android.bp index 2a9ba05571..6d1836720d 100644 --- a/camera/device/3.5/Android.bp +++ b/camera/device/3.5/Android.bp @@ -23,6 +23,8 @@ hidl_interface { types: [ "BufferRequest", "BufferRequestStatus", + "CameraBlob", + "CameraBlobId", "StreamBufferRequestError", "StreamBufferRet", "StreamBuffersVal", diff --git a/camera/metadata/3.4/Android.bp b/camera/metadata/3.4/Android.bp index 17a2675218..d1cba14d0d 100644 --- a/camera/metadata/3.4/Android.bp +++ b/camera/metadata/3.4/Android.bp @@ -14,10 +14,16 @@ hidl_interface { "android.hardware.camera.metadata@3.3", ], types: [ + "CameraMetadataEnumAndroidDepthAvailableDynamicDepthStreamConfigurations", + "CameraMetadataEnumAndroidHeicAvailableHeicStreamConfigurations", + "CameraMetadataEnumAndroidHeicInfoSupported", "CameraMetadataEnumAndroidInfoSupportedBufferManagementVersion", + "CameraMetadataEnumAndroidRequestAvailableCapabilities", "CameraMetadataEnumAndroidScalerAvailableFormats", "CameraMetadataEnumAndroidScalerAvailableRecommendedStreamConfigurations", "CameraMetadataEnumAndroidSensorInfoColorFilterArrangement", + "CameraMetadataSection", + "CameraMetadataSectionStart", "CameraMetadataTag", ], gen_java: true, diff --git a/drm/1.2/Android.bp b/drm/1.2/Android.bp index fa2962ac75..4e0e8ba6e7 100644 --- a/drm/1.2/Android.bp +++ b/drm/1.2/Android.bp @@ -20,6 +20,7 @@ hidl_interface { "android.hidl.base@1.0", ], types: [ + "HdcpLevel", "OfflineLicenseState", "Status", ], diff --git a/graphics/common/1.2/Android.bp b/graphics/common/1.2/Android.bp index a3ebdbf219..b6cd865dd0 100644 --- a/graphics/common/1.2/Android.bp +++ b/graphics/common/1.2/Android.bp @@ -15,9 +15,12 @@ hidl_interface { "android.hardware.graphics.common@1.1", ], types: [ + "BufferUsage", "ColorMode", "Dataspace", "HardwareBuffer", + "Hdr", + "PixelFormat", ], gen_java: true, gen_java_constants: true, diff --git a/input/common/1.0/Android.bp b/input/common/1.0/Android.bp index 68a77f13d9..3de18b4961 100644 --- a/input/common/1.0/Android.bp +++ b/input/common/1.0/Android.bp @@ -9,9 +9,6 @@ hidl_interface { srcs: [ "types.hal", ], - interfaces: [ - "android.hidl.base@1.0", - ], types: [ "Action", "Axis", diff --git a/neuralnetworks/1.2/Android.bp b/neuralnetworks/1.2/Android.bp index 0642dceb2e..daf0c18e0f 100644 --- a/neuralnetworks/1.2/Android.bp +++ b/neuralnetworks/1.2/Android.bp @@ -24,6 +24,7 @@ hidl_interface { types: [ "Constant", "DeviceType", + "Extension", "FmqRequestDatum", "FmqResultDatum", "MeasureTiming", diff --git a/sensors/2.0/Android.bp b/sensors/2.0/Android.bp index 3b948a9cee..57d45ff473 100644 --- a/sensors/2.0/Android.bp +++ b/sensors/2.0/Android.bp @@ -18,6 +18,7 @@ hidl_interface { types: [ "EventQueueFlagBits", "SensorTimeout", + "WakeLockQueueFlagBits", ], gen_java: false, } diff --git a/wifi/1.3/Android.bp b/wifi/1.3/Android.bp index 45e2e88c15..8af1dc484e 100644 --- a/wifi/1.3/Android.bp +++ b/wifi/1.3/Android.bp @@ -19,9 +19,9 @@ hidl_interface { "android.hidl.base@1.0", ], types: [ - "StaLinkLayerRadioStats", - "StaLinkLayerStats", - "WifiChannelStats", + "StaLinkLayerRadioStats", + "StaLinkLayerStats", + "WifiChannelStats", ], gen_java: true, } diff --git a/wifi/supplicant/1.2/Android.bp b/wifi/supplicant/1.2/Android.bp index 18e1cca7e1..addcc2a85c 100644 --- a/wifi/supplicant/1.2/Android.bp +++ b/wifi/supplicant/1.2/Android.bp @@ -7,12 +7,12 @@ hidl_interface { enabled: true, }, srcs: [ + "types.hal", "ISupplicant.hal", "ISupplicantP2pIface.hal", "ISupplicantStaIface.hal", "ISupplicantStaIfaceCallback.hal", "ISupplicantStaNetwork.hal", - "types.hal", ], interfaces: [ "android.hardware.wifi.supplicant@1.0", @@ -21,10 +21,10 @@ hidl_interface { ], types: [ "DppAkm", - "DppNetRole", - "DppSuccessCode", - "DppProgressCode", "DppFailureCode", + "DppNetRole", + "DppProgressCode", + "DppSuccessCode", ], gen_java: true, }