Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 05:49:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Migrate all related audio component to media.audio.common.types V4" into main am: 31b4c4f88d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3041812

Change-Id: I73d089e62d88468b1b27a444f47e59a8f021cd6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-06-26 20:42:19 +00:00
committed by Automerger Merge Worker
parent df4a86caee 31b4c4f88d
commit 32cde75cee
10 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Android.bp
View File

@@ -63,8 +63,8 @@ cc_defaults {
"libbase",
// All the following are dependencies of any HAL definition library.
"libcutils",
"liblog",
"libhidlbase",
"liblog",
"libutils",
],
cflags: [

16
audio/aidl/Android.bp
View File

@@ -44,7 +44,7 @@ aidl_interface {
"android/hardware/audio/common/SinkMetadata.aidl",
"android/hardware/audio/common/SourceMetadata.aidl",
],
frozen: true,
frozen: false,
backend: {
cpp: {
enabled: true,
@@ -89,7 +89,7 @@ aidl_interface {
}
// Note: This should always be one version ahead of the last frozen version
latest_android_hardware_audio_common = "android.hardware.audio.common-V3"
latest_android_hardware_audio_common = "android.hardware.audio.common-V4"
// Modules that depend on android.hardware.audio.common directly can include
// the following cc_defaults to avoid explicitly managing dependency versions
@@ -198,11 +198,11 @@ aidl_interface {
// IMPORTANT: Update latest_android_hardware_audio_core every time you
// add the latest frozen version to versions_with_info
],
frozen: true,
frozen: false,
}
// Note: This should always be one version ahead of the last frozen version
latest_android_hardware_audio_core = "android.hardware.audio.core-V2"
latest_android_hardware_audio_core = "android.hardware.audio.core-V3"
// Modules that depend on android.hardware.audio.core directly can include
// the following cc_defaults to avoid explicitly managing dependency versions
@@ -260,11 +260,11 @@ aidl_interface {
// IMPORTANT: Update latest_android_hardware_audio_core_sounddose every time you
// add the latest frozen version to versions_with_info
],
frozen: true,
frozen: false,
}
// Note: This should always be one version ahead of the last frozen version
latest_android_hardware_audio_core_sounddose = "android.hardware.audio.core.sounddose-V2"
latest_android_hardware_audio_core_sounddose = "android.hardware.audio.core.sounddose-V3"
// Modules that depend on android.hardware.audio.core.sounddose directly can include
// the following cc_defaults to avoid explicitly managing dependency versions
@@ -368,11 +368,11 @@ aidl_interface {
},
],
frozen: true,
frozen: false,
}
latest_android_hardware_audio_effect = "android.hardware.audio.effect-V2"
latest_android_hardware_audio_effect = "android.hardware.audio.effect-V3"
cc_defaults {
name: "latest_android_hardware_audio_effect_ndk_shared",

14
audio/aidl/default/android.hardware.audio.service-aidl.xml
View File

@@ -1,39 +1,39 @@
<manifest version="1.0" type="device">
<hal format="aidl">
<name>android.hardware.audio.core</name>
<version>2</version>
<version>3</version>
<fqname>IModule/default</fqname>
</hal>
<hal format="aidl">
<name>android.hardware.audio.core</name>
<version>2</version>
<version>3</version>
<fqname>IModule/r_submix</fqname>
</hal>
<hal format="aidl">
<name>android.hardware.audio.core</name>
<version>2</version>
<version>3</version>
<fqname>IModule/bluetooth</fqname>
</hal>
<hal format="aidl">
<name>android.hardware.audio.core</name>
<version>2</version>
<version>3</version>
<fqname>IConfig/default</fqname>
</hal>
<!-- Uncomment when these modules present in the configuration
<hal format="aidl">
<name>android.hardware.audio.core</name>
<version>1</version>
<version>3</version>
<fqname>IModule/stub</fqname>
</hal>
<hal format="aidl">
<name>android.hardware.audio.core</name>
<version>1</version>
<version>3</version>
<fqname>IModule/usb</fqname>
</hal>
-->
<hal format="aidl">
<name>android.hardware.audio.effect</name>
<version>2</version>
<version>3</version>
<fqname>IFactory/default</fqname>
</hal>
</manifest>

4
audio/aidl/sounddose/Android.bp
View File

@@ -56,11 +56,11 @@ aidl_interface {
// IMPORTANT: Update latest_android_hardware_audio_sounddose every time you
// add the latest frozen version to versions_with_info
],
frozen: true,
frozen: false,
}
// Note: This should always be one version ahead of the last frozen version
latest_android_hardware_audio_sounddose = "android.hardware.audio.sounddose-V2"
latest_android_hardware_audio_sounddose = "android.hardware.audio.sounddose-V3"
// Modules that depend on android.hardware.audio.sounddose directly can include
// the following cc_defaults to avoid explicitly managing dependency versions

4
automotive/audiocontrol/aidl/Android.bp
View File

@@ -62,12 +62,12 @@ aidl_interface {
},
],
frozen: true,
frozen: false,
}
// Note: This should always be one version ahead of the last frozen version
latest_android_hardware_automotive_audiocontrol = "android.hardware.automotive.audiocontrol-V4"
latest_android_hardware_automotive_audiocontrol = "android.hardware.automotive.audiocontrol-V5"
cc_defaults {
name: "latest_android_hardware_automotive_audiocontrol_cpp_static",

4
bluetooth/audio/aidl/Android.bp
View File

@@ -85,12 +85,12 @@ aidl_interface {
},
],
frozen: true,
frozen: false,
}
// Note: This should always be one version ahead of the last frozen version
latest_android_hardware_bluetooth_audio = "android.hardware.bluetooth.audio-V4"
latest_android_hardware_bluetooth_audio = "android.hardware.bluetooth.audio-V5"
cc_defaults {
name: "latest_android_hardware_bluetooth_audio_ndk_shared",

2
bluetooth/audio/aidl/default/bluetooth_audio.xml
View File

@@ -1,7 +1,7 @@
<manifest version="1.0" type="device">
<hal format="aidl">
<name>android.hardware.bluetooth.audio</name>
<version>4</version>
<version>5</version>
<fqname>IBluetoothAudioProviderFactory/default</fqname>
</hal>
</manifest>

12
compatibility_matrices/compatibility_matrix.202504.xml
View File

@@ -1,7 +1,7 @@
<compatibility-matrix version="1.0" type="framework" level="202504">
<hal format="aidl">
<name>android.hardware.audio.core</name>
<version>1-2</version>
<version>1-3</version>
<interface>
<name>IModule</name>
<instance>default</instance>
@@ -20,7 +20,7 @@
</hal>
<hal format="aidl">
<name>android.hardware.audio.effect</name>
<version>1-2</version>
<version>1-3</version>
<interface>
<name>IFactory</name>
<instance>default</instance>
@@ -28,7 +28,7 @@
</hal>
<hal format="aidl">
<name>android.hardware.audio.sounddose</name>
<version>1-2</version>
<version>1-3</version>
<interface>
<name>ISoundDoseFactory</name>
<instance>default</instance>
@@ -44,7 +44,7 @@
</hal>
<hal format="aidl">
<name>android.hardware.automotive.audiocontrol</name>
<version>2-4</version>
<version>2-5</version>
<interface>
<name>IAudioControl</name>
<instance>default</instance>
@@ -132,7 +132,7 @@
</hal>
<hal format="aidl">
<name>android.hardware.bluetooth.audio</name>
<version>3-4</version>
<version>3-5</version>
<interface>
<name>IBluetoothAudioProviderFactory</name>
<instance>default</instance>
@@ -542,7 +542,7 @@
</hal>
<hal format="aidl">
<name>android.hardware.soundtrigger3</name>
<version>1-2</version>
<version>1-3</version>
<interface>
<name>ISoundTriggerHw</name>
<instance>default</instance>

1
compatibility_matrices/exclude/fcm_exclude.cpp
View File

@@ -164,6 +164,7 @@ bool ShouldCheckMissingAidlHalsInFcm(const std::string& packageAndVersion) {
// AIDL
"android.hardware.audio.core.sounddose@1",
"android.hardware.audio.core.sounddose@2",
"android.hardware.audio.core.sounddose@3",
// Deprecated HALs.
"android.hardware.bluetooth.audio@1",

4
soundtrigger/aidl/Android.bp
View File

@@ -35,7 +35,7 @@ aidl_interface {
sdk_version: "module_current",
},
},
frozen: true,
frozen: false,
versions_with_info: [
{
version: "1",
@@ -52,7 +52,7 @@ aidl_interface {
}
// Note: This should always be one version ahead of the last frozen version
latest_android_hardware_soundtrigger3 = "android.hardware.soundtrigger3-V2"
latest_android_hardware_soundtrigger3 = "android.hardware.soundtrigger3-V3"
// Modules that depend on android.hardware.soundtrigger3 directly can include
// the following java_defaults to avoid explicitly managing dependency versions