diff --git a/audio/Android.bp b/audio/Android.bp index 02615f1..1662d8d 100644 --- a/audio/Android.bp +++ b/audio/Android.bp @@ -9,10 +9,10 @@ package { } cc_defaults { - name: "aidlaudioservice_defaults", + name: "aidlaudioservice_rpi_defaults", vendor: true, shared_libs: [ - "libalsautilsv2", + "libalsautilsv2-rpi", "libaudio_aidl_conversion_common_ndk", "libaudioaidlcommon", "libaudioutils", @@ -32,7 +32,7 @@ cc_defaults { ], header_libs: [ "libaudio_system_headers", - "libaudioaidl_headers", + "libaudioaidl_rpi_headers", "libxsdc-utils", ], cflags: [ @@ -41,9 +41,9 @@ cc_defaults { } cc_library { - name: "libaudioserviceexampleimpl", + name: "libaudioserviceimpl-rpi", defaults: [ - "aidlaudioservice_defaults", + "aidlaudioservice_rpi_defaults", "latest_android_media_audio_common_types_ndk_shared", "latest_android_hardware_audio_core_ndk_shared", "latest_android_hardware_audio_core_sounddose_ndk_shared", @@ -88,19 +88,19 @@ cc_library { "usb/UsbAlsaMixerControl.cpp", ], generated_sources: [ - "audio_policy_capengine_configuration_aidl_default", - "audio_policy_configuration_aidl_default", - "audio_policy_engine_configuration_aidl_default", + "audio_policy_capengine_configuration_aidl_rpi", + "audio_policy_configuration_aidl_rpi", + "audio_policy_engine_configuration_aidl_rpi", ], generated_headers: [ - "audio_policy_capengine_configuration_aidl_default", - "audio_policy_configuration_aidl_default", - "audio_policy_engine_configuration_aidl_default", + "audio_policy_capengine_configuration_aidl_rpi", + "audio_policy_configuration_aidl_rpi", + "audio_policy_engine_configuration_aidl_rpi", ], export_generated_headers: [ - "audio_policy_capengine_configuration_aidl_default", - "audio_policy_configuration_aidl_default", - "audio_policy_engine_configuration_aidl_default", + "audio_policy_capengine_configuration_aidl_rpi", + "audio_policy_configuration_aidl_rpi", + "audio_policy_engine_configuration_aidl_rpi", ], shared_libs: [ "android.hardware.bluetooth.audio-impl", @@ -125,7 +125,7 @@ cc_library { } cc_library { - name: "libeffectconfig", + name: "libeffectconfig-rpi", srcs: [ "EffectConfig.cpp", ], @@ -145,7 +145,7 @@ cc_library { ], header_libs: [ "libaudio_system_headers", - "libaudioaidl_headers", + "libaudioaidl_rpi_headers", ], export_shared_lib_headers: [ "libtinyxml2", @@ -171,17 +171,17 @@ cc_library { } cc_binary { - name: "android.hardware.audio.service-aidl.example", + name: "android.hardware.audio.service.rpi", relative_install_path: "hw", defaults: [ - "aidlaudioservice_defaults", + "aidlaudioservice_rpi_defaults", "latest_android_hardware_audio_core_sounddose_ndk_shared", "latest_android_hardware_audio_core_ndk_shared", "latest_android_hardware_bluetooth_audio_ndk_shared", "latest_android_media_audio_common_types_ndk_shared", ], static_libs: [ - "libaudioserviceexampleimpl", + "libaudioserviceimpl-rpi", ], shared_libs: [ "android.hardware.bluetooth.audio-impl", @@ -199,11 +199,11 @@ cc_binary { "-Wthread-safety", "-DBACKEND_NDK", ], - installable: false, //installed in apex com.android.hardware.audio + installable: false, //installed in apex com.android.hardware.audio.rpi5 } cc_defaults { - name: "aidlaudioeffectservice_defaults", + name: "aidlaudioeffectservice_rpi_defaults", defaults: [ "latest_android_media_audio_common_types_ndk_shared", "latest_android_hardware_audio_effect_ndk_shared", @@ -223,7 +223,7 @@ cc_defaults { "android.hardware.common.fmq-V1-ndk", ], header_libs: [ - "libaudioaidl_headers", + "libaudioaidl_rpi_headers", "libaudio_system_headers", "libsystem_headers", ], @@ -237,36 +237,36 @@ cc_defaults { } cc_binary { - name: "android.hardware.audio.effect.service-aidl.example", + name: "android.hardware.audio.effect.service.rpi", relative_install_path: "hw", - defaults: ["aidlaudioeffectservice_defaults"], + defaults: ["aidlaudioeffectservice_rpi_defaults"], shared_libs: [ "libapexsupport", - "libeffectconfig", + "libeffectconfig-rpi", ], srcs: [ "EffectFactory.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 { - name: "libaudioaidl_headers", + name: "libaudioaidl_rpi_headers", export_include_dirs: ["include"], vendor_available: true, host_supported: true, } prebuilt_etc { - name: "android.hardware.audio.service-aidl.example.rc", - src: "android.hardware.audio.service-aidl.example.rc", + name: "android.hardware.audio.service.rpi.rc", + src: "android.hardware.audio.service.rpi.rc", installable: false, } prebuilt_etc { - name: "android.hardware.audio.service-aidl.xml", - src: "android.hardware.audio.service-aidl.xml", + name: "android.hardware.audio.service.rpi.xml", + src: "android.hardware.audio.service.rpi.xml", sub_dir: "vintf", installable: false, } diff --git a/audio/alsa_utils/Android.bp b/audio/alsa_utils/Android.bp index 402b76f..5d71931 100644 --- a/audio/alsa_utils/Android.bp +++ b/audio/alsa_utils/Android.bp @@ -21,7 +21,7 @@ package { } cc_defaults { - name: "libalsautils_defaults", + name: "libalsautils_rpi_defaults", vendor_available: true, srcs: [ "alsa_device_profile.c", @@ -49,16 +49,16 @@ cc_defaults { } cc_library { - name: "libalsautils", - defaults: ["libalsautils_defaults"], + name: "libalsautils-rpi", + defaults: ["libalsautils_rpi_defaults"], shared_libs: [ "libtinyalsa", ], } cc_library { - name: "libalsautilsv2", - defaults: ["libalsautils_defaults"], + name: "libalsautilsv2-rpi", + defaults: ["libalsautils_rpi_defaults"], shared_libs: [ "libtinyalsav2", ], diff --git a/audio/android.hardware.audio.service-aidl.example.rc b/audio/android.hardware.audio.service.rpi.rc similarity index 73% rename from audio/android.hardware.audio.service-aidl.example.rc rename to audio/android.hardware.audio.service.rpi.rc index c3e19ba..fcb910d 100644 --- a/audio/android.hardware.audio.service-aidl.example.rc +++ b/audio/android.hardware.audio.service.rpi.rc @@ -1,5 +1,4 @@ - -service vendor.audio-hal-aidl /apex/com.android.hardware.audio/bin/hw/android.hardware.audio.service-aidl.example +service vendor.audio-rpi /apex/com.android.hardware.audio.rpi5/bin/hw/android.hardware.audio.service.rpi class hal user audioserver # 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 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 user audioserver # media gid needed for /dev/fm (radio) and for /data/misc/media (tee) @@ -21,4 +20,4 @@ service vendor.audio-effect-hal-aidl /apex/com.android.hardware.audio/bin/hw/and rlimit rtprio 10 10 ioprio rt 4 task_profiles ProcessCapacityHigh HighPerformance - onrestart restart audioserver \ No newline at end of file + onrestart restart audioserver diff --git a/audio/android.hardware.audio.service-aidl.xml b/audio/android.hardware.audio.service.rpi.xml similarity index 100% rename from audio/android.hardware.audio.service-aidl.xml rename to audio/android.hardware.audio.service.rpi.xml diff --git a/audio/apex/com.android.hardware.audio/file_contexts b/audio/apex/com.android.hardware.audio/file_contexts deleted file mode 100644 index 41a6ada..0000000 --- a/audio/apex/com.android.hardware.audio/file_contexts +++ /dev/null @@ -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 \ No newline at end of file diff --git a/audio/apex/com.android.hardware.audio/manifest.json b/audio/apex/com.android.hardware.audio/manifest.json deleted file mode 100644 index 42a2368..0000000 --- a/audio/apex/com.android.hardware.audio/manifest.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "com.android.hardware.audio", - "version": 1 -} diff --git a/audio/apex/com.android.hardware.audio/Android.bp b/audio/apex/com.android.harware.audio.rpi5/Android.bp similarity index 78% rename from audio/apex/com.android.hardware.audio/Android.bp rename to audio/apex/com.android.harware.audio.rpi5/Android.bp index da97259..7c48c92 100644 --- a/audio/apex/com.android.hardware.audio/Android.bp +++ b/audio/apex/com.android.harware.audio.rpi5/Android.bp @@ -9,7 +9,7 @@ package { } apex { - name: "com.android.hardware.audio", + name: "com.android.hardware.audio.rpi5", manifest: "manifest.json", file_contexts: "file_contexts", key: "com.android.hardware.key", @@ -18,12 +18,12 @@ apex { vendor: true, binaries: [ - "android.hardware.audio.service-aidl.example", - "android.hardware.audio.effect.service-aidl.example", + "android.hardware.audio.service.rpi", + "android.hardware.audio.effect.service.rpi", ], prebuilts: [ - "android.hardware.audio.service-aidl.example.rc", - "android.hardware.audio.service-aidl.xml", + "android.hardware.audio.service.rpi.rc", + "android.hardware.audio.service.rpi.xml", "android.hardware.bluetooth.audio.xml", ], required: [ diff --git a/audio/apex/com.android.harware.audio.rpi5/file_contexts b/audio/apex/com.android.harware.audio.rpi5/file_contexts new file mode 100644 index 0000000..dded545 --- /dev/null +++ b/audio/apex/com.android.harware.audio.rpi5/file_contexts @@ -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 diff --git a/audio/apex/com.android.harware.audio.rpi5/manifest.json b/audio/apex/com.android.harware.audio.rpi5/manifest.json new file mode 100644 index 0000000..a92260a --- /dev/null +++ b/audio/apex/com.android.harware.audio.rpi5/manifest.json @@ -0,0 +1,4 @@ +{ + "name": "com.android.hardware.audio.rpi5", + "version": 1 +} diff --git a/audio/config/audioPolicy/Android.bp b/audio/config/audioPolicy/Android.bp index baa3762..23dfbd4 100644 --- a/audio/config/audioPolicy/Android.bp +++ b/audio/config/audioPolicy/Android.bp @@ -9,7 +9,7 @@ package { } xsd_config { - name: "audio_policy_configuration_aidl_default", + name: "audio_policy_configuration_aidl_rpi", srcs: ["audio_policy_configuration.xsd"], package_name: "android.audio.policy.configuration", nullability: true, diff --git a/audio/config/audioPolicy/capengine/Android.bp b/audio/config/audioPolicy/capengine/Android.bp index cb99923..9a25f98 100644 --- a/audio/config/audioPolicy/capengine/Android.bp +++ b/audio/config/audioPolicy/capengine/Android.bp @@ -9,7 +9,7 @@ package { } xsd_config { - name: "audio_policy_capengine_configuration_aidl_default", + name: "audio_policy_capengine_configuration_aidl_rpi", srcs: ["PolicyConfigurableDomains.xsd"], package_name: "android.audio.policy.capengine.configuration", nullability: true, diff --git a/audio/config/audioPolicy/engine/Android.bp b/audio/config/audioPolicy/engine/Android.bp index 5d62bd6..b31ec81 100644 --- a/audio/config/audioPolicy/engine/Android.bp +++ b/audio/config/audioPolicy/engine/Android.bp @@ -9,7 +9,7 @@ package { } xsd_config { - name: "audio_policy_engine_configuration_aidl_default", + name: "audio_policy_engine_configuration_aidl_rpi", srcs: ["audio_policy_engine_configuration.xsd"], package_name: "android.audio.policy.engine.configuration", nullability: true,