summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lorena Torres-Huerta <lorenatorres@google.com> 2022-08-29 21:48:04 +0000
committer Lorena Torres-Huerta <lorenatorres@google.com> 2022-09-06 21:28:25 +0000
commit2e3c6db6a6b26e919ea2d6b5bce1f80d7a75cb98 (patch)
treeb1b672a6403bf9010df6073ae2d297ac3e245e0b
parent4cd3884564d25cf243d40711056999dd547a9b0e (diff)
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)
-rw-r--r--media/Android.bp8
1 files changed, 4 insertions, 4 deletions
diff --git a/media/Android.bp b/media/Android.bp
index 7118afad975a..e97f077b347a 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"],
},
],