From a031a2940a6e872c2ae96996d723821fa907adf6 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Sat, 16 Apr 2022 08:33:06 +0900 Subject: [PATCH] V1 is the latest version of android.media.audio.common.types As part of the AIDL API freeze for TM, the V1 of android.media.autio.common.types was frozen. As a result, unversioned reference to the interface now refers to the V2 of the interface, yet to be frozen. This causes ODR violation where V1 and V2 of the interfaces are both used in the platform. To fix that, replaced the unversioned reference explicitly with the reference to V1. Bug: 225941299 Test: m Change-Id: I1d4faa3cd541acdecacec5c711050d0e925ca36d --- media/Android.bp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/Android.bp b/media/Android.bp index 36da253cf60fa..3516d25fb17f4 100644 --- a/media/Android.bp +++ b/media/Android.bp @@ -35,7 +35,7 @@ aidl_interface { "aidl/android/media/soundtrigger_middleware/SoundTriggerModuleDescriptor.aidl", ], imports: [ - "android.media.audio.common.types", + "android.media.audio.common.types-V1", "android.media.soundtrigger.types-V1", "media_permission-aidl", ],