commit 000068d6d9bb54f9393f88beda3252514a34b7df
author Steven Moreland <smoreland@google.com> Fri Dec 23 02:23:25 2022 +0000
committer Steven Moreland <smoreland@google.com> Wed Dec 28 18:59:04 2022 +0000
tree 9ec8f0868bf85d5e8d4dd17456009a0145de79a8
parent 945c90f7f5fe7d8b41c764c4f9fcc2a1775af538

specify import version (camera)

Required to automate AIDL finalization - makes errors show up
now instead of later.

Bug: 188871598
Test: build
Change-Id: Ia38678a7dbc0abc0c0d19fa0794f0f80b2638156
Merged-In: I382dea5d13582817959001246240141e83d8172d

camera/device/aidl/Android.bp

diff --git a/camera/device/aidl/Android.bp b/camera/device/aidl/Android.bp
index 2e45552..461e89d 100644
--- a/camera/device/aidl/Android.bp
+++ b/camera/device/aidl/Android.bp
@@ -16,9 +16,9 @@
     imports: [
         "android.hardware.common-V2",
         "android.hardware.common.fmq-V1",
-        "android.hardware.camera.common",
-        "android.hardware.camera.metadata",
-        "android.hardware.graphics.common",
+        "android.hardware.camera.common-V1",
+        "android.hardware.camera.metadata-V1",
+        "android.hardware.graphics.common-V4",
     ],
     backend: {
         cpp: {

camera/provider/aidl/Android.bp

diff --git a/camera/provider/aidl/Android.bp b/camera/provider/aidl/Android.bp
index 87a94b2..e2c2bea 100644
--- a/camera/provider/aidl/Android.bp
+++ b/camera/provider/aidl/Android.bp
@@ -14,8 +14,8 @@
         "android/hardware/camera/provider/*.aidl",
     ],
     imports: [
-        "android.hardware.camera.device",
-        "android.hardware.camera.common",
+        "android.hardware.camera.device-V1",
+        "android.hardware.camera.common-V1",
     ],
     stability: "vintf",
     backend: {