diff options
| -rw-r--r-- | device-audio-mfg.mk | 18 | ||||
| -rw-r--r-- | device-bonito.mk | 7 | ||||
| -rw-r--r-- | device-common.mk | 1 | ||||
| -rw-r--r-- | device-sargo.mk | 7 | ||||
| -rw-r--r-- | device.mk | 11 |
5 files changed, 30 insertions, 14 deletions
diff --git a/device-audio-mfg.mk b/device-audio-mfg.mk new file mode 100644 index 00000000..00bf0963 --- /dev/null +++ b/device-audio-mfg.mk @@ -0,0 +1,18 @@ +# +# Copyright (C) 2018 The Android Open-Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This is used for overriding the configurations in MFG ROM +# Please DO NOT ADD ANYTHING UNRELATED without strong purposes diff --git a/device-bonito.mk b/device-bonito.mk index 149594d5..6cf472d7 100644 --- a/device-bonito.mk +++ b/device-bonito.mk @@ -24,12 +24,5 @@ include device/google/bonito/device-common.mk DEVICE_PACKAGE_OVERLAYS += device/google/bonito/bonito/overlay -# Audio XMLs -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/mixer_paths_intcodec_b4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_intcodec_b4.xml \ - $(LOCAL_PATH)/mixer_paths_intcodec_b4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_intcodec_b4dev.xml \ - $(LOCAL_PATH)/audio_platform_info_intcodec_b4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec_b4.xml \ - $(LOCAL_PATH)/audio_platform_info_intcodec_b4dev.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec_b4dev.xml - PRODUCT_COPY_FILES += \ device/google/bonito/nfc/libnfc-nxp.bonito.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf diff --git a/device-common.mk b/device-common.mk index b15fe3a8..bd4d41b4 100644 --- a/device-common.mk +++ b/device-common.mk @@ -21,6 +21,7 @@ LOCAL_PATH := device/google/bonito # define hardware platform PRODUCT_PLATFORM := sdm670 +include device/google/bonito/device-audio-mfg.mk include device/google/bonito/device.mk # Bug 77867216 diff --git a/device-sargo.mk b/device-sargo.mk index 482b814a..8a21cda3 100644 --- a/device-sargo.mk +++ b/device-sargo.mk @@ -24,13 +24,6 @@ include device/google/bonito/device-common.mk DEVICE_PACKAGE_OVERLAYS += device/google/bonito/sargo/overlay -# Audio XMLs -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/mixer_paths_intcodec_s4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_intcodec_s4.xml \ - $(LOCAL_PATH)/mixer_paths_intcodec_s4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_intcodec_s4dev.xml \ - $(LOCAL_PATH)/audio_platform_info_intcodec_s4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec_s4.xml \ - $(LOCAL_PATH)/audio_platform_info_intcodec_s4dev.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec_s4dev.xml - PRODUCT_COPY_FILES += \ device/google/bonito/nfc/libnfc-nxp.sargo.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf @@ -546,6 +546,17 @@ PRODUCT_COPY_FILES += \ frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \ frameworks/av/services/audiopolicy/config/hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/hearing_aid_audio_policy_configuration.xml \ +# Audio XMLs +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/mixer_paths_intcodec_b4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_intcodec_b4.xml \ + $(LOCAL_PATH)/mixer_paths_intcodec_b4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_intcodec_b4dev.xml \ + $(LOCAL_PATH)/audio_platform_info_intcodec_b4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec_b4.xml \ + $(LOCAL_PATH)/audio_platform_info_intcodec_b4dev.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec_b4dev.xml \ + $(LOCAL_PATH)/mixer_paths_intcodec_s4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_intcodec_s4.xml \ + $(LOCAL_PATH)/mixer_paths_intcodec_s4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_intcodec_s4dev.xml \ + $(LOCAL_PATH)/audio_platform_info_intcodec_s4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec_s4.xml \ + $(LOCAL_PATH)/audio_platform_info_intcodec_s4dev.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec_s4dev.xml + # audio hal tables PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml \ |