Merge changes from topic "fixAudioAidlVersions-tm-dev-plus-aosp" into tm-dev-plus-aosp am: 71052c75b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19875061 Change-Id: Id95d344a8d61b5411ce89ae9e628d58b0db44b65 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
committed by
Automerger Merge Worker
commit
a4735bf97a
@@ -35,8 +35,8 @@ aidl_interface {
|
|||||||
"aidl/android/media/soundtrigger_middleware/SoundTriggerModuleDescriptor.aidl",
|
"aidl/android/media/soundtrigger_middleware/SoundTriggerModuleDescriptor.aidl",
|
||||||
],
|
],
|
||||||
imports: [
|
imports: [
|
||||||
"android.media.audio.common.types",
|
"android.media.audio.common.types-V2",
|
||||||
"android.media.soundtrigger.types",
|
"android.media.soundtrigger.types-V1",
|
||||||
"media_permission-aidl",
|
"media_permission-aidl",
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
@@ -232,12 +232,12 @@ aidl_interface {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
imports: [
|
imports: [
|
||||||
"android.media.audio.common.types",
|
"android.media.audio.common.types-V2",
|
||||||
],
|
],
|
||||||
versions_with_info: [
|
versions_with_info: [
|
||||||
{
|
{
|
||||||
version: "1",
|
version: "1",
|
||||||
imports: ["android.media.audio.common.types-V1"],
|
imports: ["android.media.audio.common.types-V2"],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user