Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32cde75c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I73d089e62d88468b1b27a444f47e59a8f021cd6f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents df4a86ca 31b4c4f8

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ cc_defaults { 
        "libbase",

        // All the following are dependencies of any HAL definition library.

        "libcutils",

        "liblog",

        "libhidlbase",

        "liblog",

        "libutils",

    ],

    cflags: [

audio/aidl/Android.bp

+8 −8
Original line number Diff line number Diff line
@@ -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",

audio/aidl/default/android.hardware.audio.service-aidl.xml

+7 −7
Original line number Diff line number Diff line 
<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>

audio/aidl/sounddose/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -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

automotive/audiocontrol/aidl/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -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",