Merge "audio: change audio table location" into qt-qpr1-dev am: 28b5a042b2 am: f103279b60

Change-Id: I687502d6d35ea08638acd9f37f196a582bd96758
This commit is contained in:
Automerger Merge Worker
2020-02-13 07:39:13 +00:00
committed by Cyan_Hsieh

View File

@@ -35,7 +35,7 @@ PRODUCT_SOONG_NAMESPACES += \
DEVICE_PACKAGE_OVERLAYS += device/google/redfin/redfin/overlay
# Audio XMLs for redfin
ifeq ($(wildcard vendor/google_fih/redfin/factory/packages/fih/ftm.mk),)
ifeq ($(wildcard vendor/google_fih/redfin/factory/prebuilt/ftm.mk),)
PRODUCT_COPY_FILES += \
$(foreach f,$(shell find $(LOCAL_PATH)/audio/ -type f -name "audio_platform_info*.xml"),$(f):$(TARGET_COPY_OUT_VENDOR)/etc/$(notdir $(f)))
endif
@@ -52,7 +52,7 @@ PRODUCT_COPY_FILES += \
frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml
# Audio ACDB data
ifeq ($(wildcard vendor/google_fih/redfin/factory/packages/fih/ftm.mk),)
ifeq ($(wildcard vendor/google_fih/redfin/factory/prebuilt/ftm.mk),)
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/audio/acdbdata/Bluetooth_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/Bluetooth_cal.acdb \
$(LOCAL_PATH)/audio/acdbdata/General_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/General_cal.acdb \