diff options
| author | Gaurav Shah <gauravsh@google.com> | 2015-10-16 02:45:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-16 02:45:34 +0000 |
| commit | 7bcb4b821ae53f6f3becbf147e514687502f2ef5 (patch) | |
| tree | 8313f44ab73eddc17f1aab8b0720a8593a3b7677 | |
| parent | 4826308e2f9487aa38f5783af9d25fb465f69dc1 (diff) | |
| parent | 5b9938c0654d32820dfb55ee500d04061658952d (diff) | |
| download | dragonboard-7bcb4b821ae53f6f3becbf147e514687502f2ef5.tar.gz | |
Merge "Remove audio config and bootctrl HAL from base product" into mnc-brillo-dev
| -rw-r--r-- | BoardConfig.mk | 6 | ||||
| -rw-r--r-- | base_product/dragonboard.mk | 10 |
2 files changed, 6 insertions, 10 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 6724e8f..40e63c2 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -30,6 +30,12 @@ PRODUCT_COPY_FILES += \ device/qcom/dragonboard/fstab:root/fstab.${soc_name} \ device/qcom/dragonboard/provision-device:provision-device +# Install DragonBoard-specific audio policy, audio effects config and mixer path files. +PRODUCT_COPY_FILES += \ + device/qcom/dragonboard/base_product/audio_policy.conf:system/etc/audio_policy.conf \ + device/qcom/dragonboard/base_product/audio_effects.conf:system/etc/audio_effects.conf \ + device/qcom/dragonboard/base_product/mixer_paths_sbc.xml:system/etc/mixer_paths_sbc.xml + BOARD_SEPOLICY_DIRS += \ device/qcom/dragonboard/sepolicy diff --git a/base_product/dragonboard.mk b/base_product/dragonboard.mk index 9475f6e..b0a7a41 100644 --- a/base_product/dragonboard.mk +++ b/base_product/dragonboard.mk @@ -24,13 +24,3 @@ PRODUCT_DEVICE := dragonboard # Install DragonBoard-specific config file for weaved. PRODUCT_COPY_FILES += \ device/qcom/dragonboard/base_product/weaved.conf:system/etc/weaved/weaved.conf - -# Install DragonBoard-specific audio policy, audio efects config and mixer path files. -PRODUCT_COPY_FILES += \ - device/qcom/dragonboard/base_product/audio_policy.conf:system/etc/audio_policy.conf \ - device/qcom/dragonboard/base_product/audio_effects.conf:system/etc/audio_effects.conf \ - device/qcom/dragonboard/base_product/mixer_paths_sbc.xml:system/etc/mixer_paths_sbc.xml - -# Include the copy-boot_X-to-boot implementation of the boot_control HAL. -PRODUCT_PACKAGES += \ - bootctrl.default |