commit c10572eff23c10893efb5d6e3a07f48527cfc1f2
author Mikhail Naganov <mnaganov@google.com> Fri May 21 17:42:02 2021 -0700
committer Mikhail Naganov <mnaganov@google.com> Fri May 21 17:42:02 2021 -0700
tree cc74a45b8bdacc06203342a90778974622ce72d8
parent b8d2b1db10a85aae3c9bb200b290722cdb6e43df

Remove dependency on android.media.audio.common.AudioFormat

In a preparation to converting audio HAL to SAIDL,
ensure that Framework SAIDL is self-contained and
has all the necessary types.

This creates a temporary duplication of types with
android.media.audio.common which will be fixed once
we stabilize the common types between the framework
and HALs.

Bug: 188932434
Test: m
Change-Id: Ib632c0ae5d2d1562266c87480b585b1b7f6e5ac6

media/libaudioclient/Android.bp

diff --git a/media/libaudioclient/Android.bp b/media/libaudioclient/Android.bp
index c7f23e3..85c33a0 100644
--- a/media/libaudioclient/Android.bp
+++ b/media/libaudioclient/Android.bp
@@ -312,6 +312,7 @@
         "aidl/android/media/AudioEncapsulationMode.aidl",
         "aidl/android/media/AudioEncapsulationMetadataType.aidl",
         "aidl/android/media/AudioEncapsulationType.aidl",
+        "aidl/android/media/AudioFormatSys.aidl",
         "aidl/android/media/AudioFlag.aidl",
         "aidl/android/media/AudioGain.aidl",
         "aidl/android/media/AudioGainConfig.aidl",
@@ -354,7 +355,6 @@
         "aidl/android/media/TrackSecondaryOutputInfo.aidl",
     ],
     imports: [
-        "android.media.audio.common.types",
         "media_permission-aidl",
     ],
     backend: {
@@ -395,7 +395,6 @@
         "aidl/android/media/SoundTriggerSession.aidl",
     ],
     imports: [
-        "android.media.audio.common.types",
         "audioclient-types-aidl",
     ],
     backend: {
@@ -438,7 +437,6 @@
         "aidl/android/media/IAudioTrackCallback.aidl",
     ],
     imports: [
-        "android.media.audio.common.types",
         "audioclient-types-aidl",
         "av-types-aidl",
         "effect-aidl",
@@ -476,7 +474,6 @@
         "aidl/android/media/IAudioPolicyServiceClient.aidl",
     ],
     imports: [
-        "android.media.audio.common.types",
         "audioclient-types-aidl",
         "audiopolicy-types-aidl",
         "capture_state_listener-aidl",