commit edd58d4813826beeb5f11f5d207d81cb682dd76c
author Jiyong Park <jiyong@google.com> Wed Apr 20 16:47:54 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 20 16:47:54 2022 +0000
tree 11f87469e058a5482f657590261db0e2f610e0c3
parent 90f4c3a0609db81e0793b69fcdf810918fc9a545
parent a9d911109ad08b6ca357e797bb04f441541a50a5

Merge changes from topic "aidl_freeze_tm" into tm-dev am: 18ba537008 am: a9d911109a

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

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

audio/aidl/Android.bp

diff --git a/audio/aidl/Android.bp b/audio/aidl/Android.bp
index 46d177f..0b5b993 100644
--- a/audio/aidl/Android.bp
+++ b/audio/aidl/Android.bp
@@ -33,7 +33,7 @@
         "android/hardware/audio/common/SourceMetadata.aidl",
     ],
     imports: [
-        "android.media.audio.common.types",
+        "android.media.audio.common.types-V1",
     ],
     stability: "vintf",
     backend: {

automotive/audiocontrol/aidl/Android.bp

diff --git a/automotive/audiocontrol/aidl/Android.bp b/automotive/audiocontrol/aidl/Android.bp
index 0a3e1f5..e5f7a4f 100644
--- a/automotive/audiocontrol/aidl/Android.bp
+++ b/automotive/audiocontrol/aidl/Android.bp
@@ -14,8 +14,8 @@
     vendor_available: true,
     srcs: ["android/hardware/automotive/audiocontrol/*.aidl"],
     imports: [
-        "android.hardware.audio.common",
-        "android.media.audio.common.types",
+        "android.hardware.audio.common-V1",
+        "android.media.audio.common.types-V1",
     ],
     stability: "vintf",
     backend: {