Revert "extractors: Add aptX & aptXHD to confirmed platforms"

This reverts commit fc48325bb3367e3d7b7dac422e814431d25d98e0.

Change-Id: I10fe56c2a36a23894c466beb97a41060fcc437b7

4 files changed, 0 insertions, 48 deletions

diff --git a/extractors/README.md b/extractors/README.md
index bac8e12..5da0f77 100644
--- a/extractors/README.md
+++ b/extractors/README.md
@@ -27,14 +27,6 @@ msm8992: Any 6.0+ kernel
 msm8994: Any 6.0+ kernel  
 msm8996: Patched mdss/kgsl up to LA.UM.5.5.r1-00100-8x96.0  
 
-## Bluetooth:
-### Origins:
-aptX: blob from griffin npl25.86-15  
-aptXHD: blob from h918 nrd90m (renamed)  
-### Min Bluetooth/CAF patch level required:
-aptX: bt.lnx.2.1-00007  
-aptXHD: bt.lnx.2.1-00014  
-
 ### Notes:
 <a name="googleEGL">1</a>: Google likes to strip QUIC branches from their shipped binaries so we can't really know which branch they originate from  
 <a name="floEGL">2</a>: On top of what's stated in footnote 1, flo's drivers deviate greatly from those of any CAF branch
diff --git a/extractors/bluetooth.txt b/extractors/bluetooth.txt
deleted file mode 100644
index 28c0d07..0000000
--- a/extractors/bluetooth.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# aptX
-vendor/lib/libaptX-1.0.0-rel-Android21-ARMv7A.so
-vendor/lib/libaptXHD-1.0.0-rel-Android21-ARMv7A.so
-vendor/lib/libaptXScheduler.so
diff --git a/extractors/extract-files.sh b/extractors/extract-files.sh
index 1abd438..9d4a60c 100755
--- a/extractors/extract-files.sh
+++ b/extractors/extract-files.sh
@@ -46,9 +46,6 @@ if [ -f "$MY_DIR"/"$SUBSYSTEM"-"$PLATFORM"-32.txt -a -f "$MY_DIR"/"$SUBSYSTEM"-"
 
     setup_vendor "$DEVICE/${PLATFORM}-64/$SUBSYSTEM" "$VENDOR" "$CM_ROOT" true true $SUBSYSTEM
     extract "$MY_DIR"/"$SUBSYSTEM"-"$PLATFORM"-64.txt "$SRC"
-else if [ -f "$MY_DIR"/"$SUBSYSTEM".txt ]; then
-    setup_vendor "$DEVICE/$SUBSYSTEM" "$VENDOR" "$CM_ROOT" true true
-    extract "$MY_DIR"/"$SUBSYSTEM".txt "$SRC"
 else
     setup_vendor "$DEVICE/$PLATFORM/$SUBSYSTEM" "$VENDOR" "$CM_ROOT" true true $SUBSYSTEM
     extract "$MY_DIR"/"$SUBSYSTEM"-"$PLATFORM".txt "$SRC"
diff --git a/extractors/setup-makefiles.sh b/extractors/setup-makefiles.sh
index 9c777de..9e341b5 100755
--- a/extractors/setup-makefiles.sh
+++ b/extractors/setup-makefiles.sh
@@ -266,36 +266,3 @@ ifeq (\$(BOARD_USES_QCOM_HARDWARE),true)
 include \$(call all-makefiles-under,\$(LOCAL_PATH)/\$(TARGET_BOARD_PLATFORM))
 endif
 EOF
-
-SUBSYSTEM=bluetooth
-
-# Initialize the helper
-setup_vendor "$DEVICE/$SUBSYSTEM" "$VENDOR" "$CM_ROOT" true true $SUBSYSTEM
-
-# Copyright headers and guards
-write_headers "msm8916 msm8952 msm8974 msm8992 msm8994 msm8996" TARGET_BOARD_PLATFORM
-
-# Qualcomm BSP blobs - we put a conditional around here
-# in case the BSP is actually being built
-printf '\n%s\n' "ifeq (\$(QCPATH),)" >> "$PRODUCTMK"
-
-write_makefiles "$MY_DIR"/"$SUBSYSTEM".txt
-
-echo "" >> "$PRODUCTMK"
-echo "PRODUCT_PROPERTY_OVERRIDES += \\" >> "$PRODUCTMK"
-echo "    persist.bt.enableAptXHD=true" >> "$PRODUCTMK"
-echo "endif" >> "$PRODUCTMK"
-
-# We are done!
-write_footers
-
-# Add a guard on the top level
-cat << EOF > "$CM_ROOT/vendor/$VENDOR/$DEVICE/Android.mk"
-LOCAL_PATH := \$(call my-dir)
-
-include \$(CLEAR_VARS)
-
-ifeq (\$(BOARD_USES_QCOM_HARDWARE),true)
-include \$(call all-makefiles-under,\$(LOCAL_PATH)/\$(TARGET_BOARD_PLATFORM))
-endif
-EOF