Remove bluetooth configuration file.

This now needs to be controlled on a per product basis
rather than telephony / no telephony basis.

Change-Id: I581bc0e027f844c1f7b7262c3833d8f727c3c9ec

diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index c244a93..161d0b8 100644 (file)
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -64,7 +64,6 @@ PRODUCT_COPY_FILES := \
         system/bluetooth/data/auto_pairing.conf:system/etc/bluetooth/auto_pairing.conf \
         system/bluetooth/data/blacklist.conf:system/etc/bluetooth/blacklist.conf \
         system/bluetooth/data/input.conf:system/etc/bluetooth/input.conf \
-        system/bluetooth/data/main.nonsmartphone.conf:system/etc/bluetooth/main.conf \
         system/bluetooth/data/network.conf:system/etc/bluetooth/network.conf
 
 $(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)

diff --git a/target/product/telephony.mk b/target/product/telephony.mk
index d557887..a0220de 100644 (file)
--- a/target/product/telephony.mk
+++ b/target/product/telephony.mk
@@ -21,4 +21,3 @@ PRODUCT_PACKAGES := \
     Mms
 
 PRODUCT_COPY_FILES := \
-       system/bluetooth/data/main.conf:system/etc/bluetooth/main.conf