diff options
| author | Gaurav Shah <gauravsh@google.com> | 2015-10-15 19:32:52 -0700 |
|---|---|---|
| committer | Lee Campbell <leecam@google.com> | 2015-11-11 10:19:32 -0800 |
| commit | b028707a8d49918ef440567b0d9949d23ca440a7 (patch) | |
| tree | cfcf2a8416dfe7bde7435cca5a9a69cae4178f1a | |
| parent | 7f734e99d9a5b48c59084df8c69c50a8afdab03c (diff) | |
| download | dragonboard-b028707a8d49918ef440567b0d9949d23ca440a7.tar.gz | |
Remove audio config and bootctrl HAL from base product
They should instead be installed for all products using
dragonboard as the underlying board.
BUG: 24980129
Change-Id: I7fe2068b2e6d36229ffa9849f5ddf51deff88cb3
| -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 |