From 9b9ce2a4cb336531033bfe450bff19a6f3b53226 Mon Sep 17 00:00:00 2001 From: Lorena Torres-Huerta Date: Mon, 29 Aug 2022 21:48:04 +0000 Subject: [PATCH] Use explicit aidl versions for audio hal and soundtrigger dependencies. There are still issues with importing implicit versions. Switching to explicit versions while b/188871598 is worked out. Bug: 242678729 Test: m; AIDL_TRANSITIVE_FREEZE=true m aidl-freeze-api && AIDL_FROZEN_REL=true m Merged-In: If5a96c05b6448b588aa6326225dc6962ca7da6c7 Change-Id: If5a96c05b6448b588aa6326225dc6962ca7da6c7 (cherry picked from commit 56ec5d9ed5a02e7302b150c6f608ffdcb013c7bd) --- media/Android.bp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/media/Android.bp b/media/Android.bp index 7118afad975ac..e97f077b347a4 100644 --- a/media/Android.bp +++ b/media/Android.bp @@ -35,8 +35,8 @@ aidl_interface { "aidl/android/media/soundtrigger_middleware/SoundTriggerModuleDescriptor.aidl", ], imports: [ - "android.media.audio.common.types", - "android.media.soundtrigger.types", + "android.media.audio.common.types-V2", + "android.media.soundtrigger.types-V1", "media_permission-aidl", ], } @@ -232,12 +232,12 @@ aidl_interface { }, }, imports: [ - "android.media.audio.common.types", + "android.media.audio.common.types-V2", ], versions_with_info: [ { version: "1", - imports: ["android.media.audio.common.types-V1"], + imports: ["android.media.audio.common.types-V2"], }, ],