From c1942ad9e7194489f992c4499a1b469dedd40e58 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Tue, 22 Mar 2022 14:58:16 +0900 Subject: [PATCH] Explicitly depend on V1 of soundtrigger.types sountrigger.types now has V1 (frozen) and V2 (unstable). `sountrigger.types` without the version suffix references the unstable one and causes an ODR violation where there's a transitive dependency to V1 (via other stable AIDL interface). Bug: 225941299 Test: m Change-Id: Ia7a3f002a768a4a879bb8495467c75cb11844459 --- media/Android.bp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/Android.bp b/media/Android.bp index eceb9bc9bdd6..36da253cf60f 100644 --- a/media/Android.bp +++ b/media/Android.bp @@ -36,7 +36,7 @@ aidl_interface { ], imports: [ "android.media.audio.common.types", - "android.media.soundtrigger.types", + "android.media.soundtrigger.types-V1", "media_permission-aidl", ], }