PawletOS/android_device_brcm_rpi5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

audio: rename hal for rpi

Browse Source
This commit is contained in:
Konsta
2025-10-22 17:40:31 +03:00
parent 451c17acd0
commit 375a38c961
12 changed files with 55 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
audio/Android.bp
View File

@@ -9,10 +9,10 @@ package {
} }
cc_defaults { cc_defaults {
name: "aidlaudioservice_defaults", name: "aidlaudioservice_rpi_defaults",
vendor: true, vendor: true,
shared_libs: [ shared_libs: [
"libalsautilsv2", "libalsautilsv2-rpi",
"libaudio_aidl_conversion_common_ndk", "libaudio_aidl_conversion_common_ndk",
"libaudioaidlcommon", "libaudioaidlcommon",
"libaudioutils", "libaudioutils",
@@ -32,7 +32,7 @@ cc_defaults {
], ],
header_libs: [ header_libs: [
"libaudio_system_headers", "libaudio_system_headers",
"libaudioaidl_headers", "libaudioaidl_rpi_headers",
"libxsdc-utils", "libxsdc-utils",
], ],
cflags: [ cflags: [
@@ -41,9 +41,9 @@ cc_defaults {
} }
cc_library { cc_library {
name: "libaudioserviceexampleimpl", name: "libaudioserviceimpl-rpi",
defaults: [ defaults: [
"aidlaudioservice_defaults", "aidlaudioservice_rpi_defaults",
"latest_android_media_audio_common_types_ndk_shared", "latest_android_media_audio_common_types_ndk_shared",
"latest_android_hardware_audio_core_ndk_shared", "latest_android_hardware_audio_core_ndk_shared",
"latest_android_hardware_audio_core_sounddose_ndk_shared", "latest_android_hardware_audio_core_sounddose_ndk_shared",
@@ -88,19 +88,19 @@ cc_library {
"usb/UsbAlsaMixerControl.cpp", "usb/UsbAlsaMixerControl.cpp",
], ],
generated_sources: [ generated_sources: [
"audio_policy_capengine_configuration_aidl_default", "audio_policy_capengine_configuration_aidl_rpi",
"audio_policy_configuration_aidl_default", "audio_policy_configuration_aidl_rpi",
"audio_policy_engine_configuration_aidl_default", "audio_policy_engine_configuration_aidl_rpi",
], ],
generated_headers: [ generated_headers: [
"audio_policy_capengine_configuration_aidl_default", "audio_policy_capengine_configuration_aidl_rpi",
"audio_policy_configuration_aidl_default", "audio_policy_configuration_aidl_rpi",
"audio_policy_engine_configuration_aidl_default", "audio_policy_engine_configuration_aidl_rpi",
], ],
export_generated_headers: [ export_generated_headers: [
"audio_policy_capengine_configuration_aidl_default", "audio_policy_capengine_configuration_aidl_rpi",
"audio_policy_configuration_aidl_default", "audio_policy_configuration_aidl_rpi",
"audio_policy_engine_configuration_aidl_default", "audio_policy_engine_configuration_aidl_rpi",
], ],
shared_libs: [ shared_libs: [
"android.hardware.bluetooth.audio-impl", "android.hardware.bluetooth.audio-impl",
@@ -125,7 +125,7 @@ cc_library {
} }
cc_library { cc_library {
name: "libeffectconfig", name: "libeffectconfig-rpi",
srcs: [ srcs: [
"EffectConfig.cpp", "EffectConfig.cpp",
], ],
@@ -145,7 +145,7 @@ cc_library {
], ],
header_libs: [ header_libs: [
"libaudio_system_headers", "libaudio_system_headers",
"libaudioaidl_headers", "libaudioaidl_rpi_headers",
], ],
export_shared_lib_headers: [ export_shared_lib_headers: [
"libtinyxml2", "libtinyxml2",
@@ -171,17 +171,17 @@ cc_library {
} }
cc_binary { cc_binary {
name: "android.hardware.audio.service-aidl.example", name: "android.hardware.audio.service.rpi",
relative_install_path: "hw", relative_install_path: "hw",
defaults: [ defaults: [
"aidlaudioservice_defaults", "aidlaudioservice_rpi_defaults",
"latest_android_hardware_audio_core_sounddose_ndk_shared", "latest_android_hardware_audio_core_sounddose_ndk_shared",
"latest_android_hardware_audio_core_ndk_shared", "latest_android_hardware_audio_core_ndk_shared",
"latest_android_hardware_bluetooth_audio_ndk_shared", "latest_android_hardware_bluetooth_audio_ndk_shared",
"latest_android_media_audio_common_types_ndk_shared", "latest_android_media_audio_common_types_ndk_shared",
], ],
static_libs: [ static_libs: [
"libaudioserviceexampleimpl", "libaudioserviceimpl-rpi",
], ],
shared_libs: [ shared_libs: [
"android.hardware.bluetooth.audio-impl", "android.hardware.bluetooth.audio-impl",
@@ -199,11 +199,11 @@ cc_binary {
"-Wthread-safety", "-Wthread-safety",
"-DBACKEND_NDK", "-DBACKEND_NDK",
], ],
installable: false, //installed in apex com.android.hardware.audio installable: false, //installed in apex com.android.hardware.audio.rpi5
} }
cc_defaults { cc_defaults {
name: "aidlaudioeffectservice_defaults", name: "aidlaudioeffectservice_rpi_defaults",
defaults: [ defaults: [
"latest_android_media_audio_common_types_ndk_shared", "latest_android_media_audio_common_types_ndk_shared",
"latest_android_hardware_audio_effect_ndk_shared", "latest_android_hardware_audio_effect_ndk_shared",
@@ -223,7 +223,7 @@ cc_defaults {
"android.hardware.common.fmq-V1-ndk", "android.hardware.common.fmq-V1-ndk",
], ],
header_libs: [ header_libs: [
"libaudioaidl_headers", "libaudioaidl_rpi_headers",
"libaudio_system_headers", "libaudio_system_headers",
"libsystem_headers", "libsystem_headers",
], ],
@@ -237,36 +237,36 @@ cc_defaults {
} }
cc_binary { cc_binary {
name: "android.hardware.audio.effect.service-aidl.example", name: "android.hardware.audio.effect.service.rpi",
relative_install_path: "hw", relative_install_path: "hw",
defaults: ["aidlaudioeffectservice_defaults"], defaults: ["aidlaudioeffectservice_rpi_defaults"],
shared_libs: [ shared_libs: [
"libapexsupport", "libapexsupport",
"libeffectconfig", "libeffectconfig-rpi",
], ],
srcs: [ srcs: [
"EffectFactory.cpp", "EffectFactory.cpp",
"EffectMain.cpp", "EffectMain.cpp",
], ],
installable: false, //installed in apex com.android.hardware.audio installable: false, //installed in apex com.android.hardware.audio.rpi5
} }
cc_library_headers { cc_library_headers {
name: "libaudioaidl_headers", name: "libaudioaidl_rpi_headers",
export_include_dirs: ["include"], export_include_dirs: ["include"],
vendor_available: true, vendor_available: true,
host_supported: true, host_supported: true,
} }
prebuilt_etc { prebuilt_etc {
name: "android.hardware.audio.service-aidl.example.rc", name: "android.hardware.audio.service.rpi.rc",
src: "android.hardware.audio.service-aidl.example.rc", src: "android.hardware.audio.service.rpi.rc",
installable: false, installable: false,
} }
prebuilt_etc { prebuilt_etc {
name: "android.hardware.audio.service-aidl.xml", name: "android.hardware.audio.service.rpi.xml",
src: "android.hardware.audio.service-aidl.xml", src: "android.hardware.audio.service.rpi.xml",
sub_dir: "vintf", sub_dir: "vintf",
installable: false, installable: false,
} }

10
audio/alsa_utils/Android.bp
View File

@@ -21,7 +21,7 @@ package {
} }
cc_defaults { cc_defaults {
name: "libalsautils_defaults", name: "libalsautils_rpi_defaults",
vendor_available: true, vendor_available: true,
srcs: [ srcs: [
"alsa_device_profile.c", "alsa_device_profile.c",
@@ -49,16 +49,16 @@ cc_defaults {
} }
cc_library { cc_library {
name: "libalsautils", name: "libalsautils-rpi",
defaults: ["libalsautils_defaults"], defaults: ["libalsautils_rpi_defaults"],
shared_libs: [ shared_libs: [
"libtinyalsa", "libtinyalsa",
], ],
} }
cc_library { cc_library {
name: "libalsautilsv2", name: "libalsautilsv2-rpi",
defaults: ["libalsautils_defaults"], defaults: ["libalsautils_rpi_defaults"],
shared_libs: [ shared_libs: [
"libtinyalsav2", "libtinyalsav2",
], ],

5
audio/android.hardware.audio.service-aidl.example.rc → audio/android.hardware.audio.service.rpi.rc
View File

@@ -1,5 +1,4 @@
service vendor.audio-rpi /apex/com.android.hardware.audio.rpi5/bin/hw/android.hardware.audio.service.rpi
service vendor.audio-hal-aidl /apex/com.android.hardware.audio/bin/hw/android.hardware.audio.service-aidl.example
class hal class hal
user audioserver user audioserver
# media gid needed for /dev/fm (radio) and for /data/misc/media (tee) # media gid needed for /dev/fm (radio) and for /data/misc/media (tee)
@@ -11,7 +10,7 @@ service vendor.audio-hal-aidl /apex/com.android.hardware.audio/bin/hw/android.ha
task_profiles ProcessCapacityHigh HighPerformance task_profiles ProcessCapacityHigh HighPerformance
onrestart restart audioserver onrestart restart audioserver
service vendor.audio-effect-hal-aidl /apex/com.android.hardware.audio/bin/hw/android.hardware.audio.effect.service-aidl.example service vendor.audio-effect-rpi /apex/com.android.hardware.audio.rpi5/bin/hw/android.hardware.audio.effect.service.rpi
class hal class hal
user audioserver user audioserver
# media gid needed for /dev/fm (radio) and for /data/misc/media (tee) # media gid needed for /dev/fm (radio) and for /data/misc/media (tee)

0
audio/android.hardware.audio.service-aidl.xml → audio/android.hardware.audio.service.rpi.xml
View File

4
audio/apex/com.android.hardware.audio/file_contexts
View File

@@ -1,4 +0,0 @@
(/.*)? u:object_r:vendor_file:s0
/etc(/.*)? u:object_r:vendor_configs_file:s0
/bin/hw/android\.hardware\.audio\.service-aidl\.example u:object_r:hal_audio_default_exec:s0
/bin/hw/android\.hardware\.audio\.effect\.service-aidl\.example u:object_r:hal_audio_default_exec:s0

4
audio/apex/com.android.hardware.audio/manifest.json
View File

@@ -1,4 +0,0 @@
{
"name": "com.android.hardware.audio",
"version": 1
}

10
audio/apex/com.android.hardware.audio/Android.bp → audio/apex/com.android.harware.audio.rpi5/Android.bp
View File

@@ -9,7 +9,7 @@ package {
} }
apex { apex {
name: "com.android.hardware.audio", name: "com.android.hardware.audio.rpi5",
manifest: "manifest.json", manifest: "manifest.json",
file_contexts: "file_contexts", file_contexts: "file_contexts",
key: "com.android.hardware.key", key: "com.android.hardware.key",
@@ -18,12 +18,12 @@ apex {
vendor: true, vendor: true,
binaries: [ binaries: [
"android.hardware.audio.service-aidl.example", "android.hardware.audio.service.rpi",
"android.hardware.audio.effect.service-aidl.example", "android.hardware.audio.effect.service.rpi",
], ],
prebuilts: [ prebuilts: [
"android.hardware.audio.service-aidl.example.rc", "android.hardware.audio.service.rpi.rc",
"android.hardware.audio.service-aidl.xml", "android.hardware.audio.service.rpi.xml",
"android.hardware.bluetooth.audio.xml", "android.hardware.bluetooth.audio.xml",
], ],
required: [ required: [

4
audio/apex/com.android.harware.audio.rpi5/file_contexts Normal file
View File

@@ -0,0 +1,4 @@
(/.*)? u:object_r:vendor_file:s0
/etc(/.*)? u:object_r:vendor_configs_file:s0
/bin/hw/android\.hardware\.audio\.service.rpi u:object_r:hal_audio_default_exec:s0
/bin/hw/android\.hardware\.audio\.effect\.service.rpi u:object_r:hal_audio_default_exec:s0

4
audio/apex/com.android.harware.audio.rpi5/manifest.json Normal file
View File

@@ -0,0 +1,4 @@
{
"name": "com.android.hardware.audio.rpi5",
"version": 1
}

2
audio/config/audioPolicy/Android.bp
View File

@@ -9,7 +9,7 @@ package {
} }
xsd_config { xsd_config {
name: "audio_policy_configuration_aidl_default", name: "audio_policy_configuration_aidl_rpi",
srcs: ["audio_policy_configuration.xsd"], srcs: ["audio_policy_configuration.xsd"],
package_name: "android.audio.policy.configuration", package_name: "android.audio.policy.configuration",
nullability: true, nullability: true,

2
audio/config/audioPolicy/capengine/Android.bp
View File

@@ -9,7 +9,7 @@ package {
} }
xsd_config { xsd_config {
name: "audio_policy_capengine_configuration_aidl_default", name: "audio_policy_capengine_configuration_aidl_rpi",
srcs: ["PolicyConfigurableDomains.xsd"], srcs: ["PolicyConfigurableDomains.xsd"],
package_name: "android.audio.policy.capengine.configuration", package_name: "android.audio.policy.capengine.configuration",
nullability: true, nullability: true,

2
audio/config/audioPolicy/engine/Android.bp
View File

@@ -9,7 +9,7 @@ package {
} }
xsd_config { xsd_config {
name: "audio_policy_engine_configuration_aidl_default", name: "audio_policy_engine_configuration_aidl_rpi",
srcs: ["audio_policy_engine_configuration.xsd"], srcs: ["audio_policy_engine_configuration.xsd"],
package_name: "android.audio.policy.engine.configuration", package_name: "android.audio.policy.engine.configuration",
nullability: true, nullability: true,