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
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 64743ec..74218f3 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -30,6 +30,12 @@
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 @@
# 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
