upgrade audio hal 4.0 -> 6.0

This commit is contained in:
Ziyang Zhou
2021-11-12 21:04:50 +08:00
parent a994f61325
commit 228e97a46e
2 changed files with 15 additions and 9 deletions

View File

@@ -2,7 +2,7 @@
<hal format="hidl"> <hal format="hidl">
<name>android.hardware.audio</name> <name>android.hardware.audio</name>
<transport>hwbinder</transport> <transport>hwbinder</transport>
<version>4.0</version> <version>6.0</version>
<interface> <interface>
<name>IDevicesFactory</name> <name>IDevicesFactory</name>
<instance>default</instance> <instance>default</instance>
@@ -11,7 +11,7 @@
<hal format="hidl"> <hal format="hidl">
<name>android.hardware.audio.effect</name> <name>android.hardware.audio.effect</name>
<transport>hwbinder</transport> <transport>hwbinder</transport>
<version>4.0</version> <version>6.0</version>
<interface> <interface>
<name>IEffectsFactory</name> <name>IEffectsFactory</name>
<instance>default</instance> <instance>default</instance>

View File

@@ -88,8 +88,8 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
audio.r_submix.default \ audio.r_submix.default \
android.hardware.audio.service \ android.hardware.audio.service \
android.hardware.audio@4.0-impl \ android.hardware.audio@6.0-impl \
android.hardware.audio.effect@4.0-impl \ android.hardware.audio.effect@6.0-impl \
android.hardware.drm@1.0-service \ android.hardware.drm@1.0-service \
android.hardware.drm@1.0-impl \ android.hardware.drm@1.0-impl \
android.hardware.drm@1.3-service.clearkey \ android.hardware.drm@1.3-service.clearkey \
@@ -105,6 +105,17 @@ PRODUCT_PACKAGES += \
android.hardware.keymaster@3.0-impl \ android.hardware.keymaster@3.0-impl \
PRODUCT_SOONG_NAMESPACES += frameworks/av/services/audiopolicy/config
# audio policy
PRODUCT_PACKAGES += \
audio_policy_configuration.xml \
r_submix_audio_policy_configuration.xml \
audio_policy_volumes.xml \
default_volume_tables.xml \
primary_audio_policy_configuration.xml \
surround_sound_configuration_5_0.xml \
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/generic/goldfish/camera/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \ device/generic/goldfish/camera/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \
device/generic/goldfish/camera/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ device/generic/goldfish/camera/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
@@ -112,11 +123,6 @@ PRODUCT_COPY_FILES += \
frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml \ frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml \
frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \ frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \
frameworks/av/media/libeffects/data/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \ frameworks/av/media/libeffects/data/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
device/generic/goldfish/audio/policy/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
device/generic/goldfish/audio/policy/primary_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/primary_audio_policy_configuration.xml \
frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
frameworks/native/data/etc/android.hardware.ethernet.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.ethernet.xml \ frameworks/native/data/etc/android.hardware.ethernet.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.ethernet.xml \
$(LOCAL_PATH)/gpu_config.sh:$(TARGET_COPY_OUT_VENDOR)/bin/gpu_config.sh \ $(LOCAL_PATH)/gpu_config.sh:$(TARGET_COPY_OUT_VENDOR)/bin/gpu_config.sh \
$(LOCAL_PATH)/init.redroid.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.redroid.rc \ $(LOCAL_PATH)/init.redroid.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.redroid.rc \