diff options
| author | Mikhail Naganov <mnaganov@google.com> | 2024-02-23 19:03:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-23 19:03:21 +0000 |
| commit | 97c9049cfe618dfaa20485798ab4b5f5610e79d1 (patch) | |
| tree | 1e89991f1aede02a14818f4e14c2f6af5a12dbc9 /shared/device.mk | |
| parent | ab30b215d3e6467db2233cf0952ba94e6fdd7522 (diff) | |
| parent | 47591b63270e26e8b2bf80f7809dc79886245a97 (diff) | |
| download | cuttlefish-97c9049cfe618dfaa20485798ab4b5f5610e79d1.tar.gz | |
Merge "auto: Use audio effect config without preprocessing" into main am: 47591b6327
Original change: https://android-review.googlesource.com/c/device/google/cuttlefish/+/2972372
Change-Id: I004f02b82316916d4d8c4f84ed7846723ce8ee83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'shared/device.mk')
| -rw-r--r-- | shared/device.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/shared/device.mk b/shared/device.mk index 314108207..c95ad2ac1 100644 --- a/shared/device.mk +++ b/shared/device.mk @@ -299,9 +299,15 @@ LOCAL_AUDIO_PRODUCT_COPY_FILES := \ 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/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml +ifeq ($(RELEASE_AIDL_USE_UNFROZEN),true) +LOCAL_AUDIO_PRODUCT_COPY_FILES += \ + hardware/interfaces/audio/aidl/default/audio_effects_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects_config.xml +else +LOCAL_AUDIO_PRODUCT_COPY_FILES += \ frameworks/av/media/libeffects/data/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml endif +endif PRODUCT_PACKAGES += $(LOCAL_AUDIO_PRODUCT_PACKAGE) PRODUCT_COPY_FILES += $(LOCAL_AUDIO_PRODUCT_COPY_FILES) |