commit aeea8c3d001554d1b05b1820432b97718efbf6f2
author Steven Moreland <smoreland@google.com> Wed Dec 28 21:17:32 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 28 21:17:32 2022 +0000
tree b0147d49950333e3e7a38a39aa50a098a734202f
parent 2238006466b30fd631bba6d2692cb100ad15ddf7
parent a791090aa0361d42270a1a82e0c8090e32fea0b7

Merge changes from topic "camera-explicit-deps" am: a791090aa0

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2368989

Change-Id: Ic140018d35c25c17e1c5eac07de269187e58dd74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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: {