bluetooth: Use bt_vendor.conf to set correct..

..firmware patch file name

Z2: Chipset BCM4335C0
Z3: Chipset BCM4350C0

* libbt(-vendor) expects the filename to match
  the chipset reported, but we have a different
  common filename (from Sony stock).
* Add bt_vendor.conf to set the correct name
  instead of creating symlinks to what was expected.

Change-Id: I78fa158d052b1913284c55d7f01eef9508b975fe

3 files changed, 6 insertions, 3 deletions

diff --git a/Android.mk b/Android.mk
index 06a7d5b..d8bc40d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -10,7 +10,4 @@ ifeq ($(BOARD_VENDOR_PLATFORM),shinano)
         $(TARGET_OUT_ETC)/firmware/wcd9320/wcd9320_mad_audio.bin; \
         ln -sf /data/misc/audio/mbhc.bin \
         $(TARGET_OUT_ETC)/firmware/wcd9320/wcd9320_mbhc.bin)
-
-    $(shell ln -sf /system/etc/firmware/BCM43xx.hcd \
-        $(TARGET_OUT_ETC)/firmware/BCM4335C0.hcd)
 endif
diff --git a/bluetooth/bt_vendor.conf b/bluetooth/bt_vendor.conf
new file mode 100644
index 0000000..3a94bab
--- /dev/null
+++ b/bluetooth/bt_vendor.conf
@@ -0,0 +1,2 @@
+# Firmware patch file name
+FwPatchFileName = BCM43xx.hcd
diff --git a/shinano.mk b/shinano.mk
index 1655771..79017f9 100644
--- a/shinano.mk
+++ b/shinano.mk
@@ -81,6 +81,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/audio/audio_effects.conf:system/vendor/etc/audio_effects.conf
 
+# Bluetooth
+PRODUCT_COPY_FILES += \
+    $(COMMON_PATH)/bluetooth/bt_vendor.conf:system/etc/bluetooth/bt_vendor.conf
+
 # Display
 PRODUCT_PACKAGES += \
     hwcomposer.msm8974 \