msm8916: Remove unused items

* These packages and binaries don't exist anymore

Change-Id: I65ae1802d18f22eb441314bca8617e1e2d284161

5 files changed, 1 insertions, 195 deletions

diff --git a/msm8916.mk b/msm8916.mk
index 268d82c..649e963 100644
--- a/msm8916.mk
+++ b/msm8916.mk
@@ -70,13 +70,6 @@ PRODUCT_PROPERTY_OVERRIDES +=
     persist.cne.feature=4
 endif
 
-# CRDA
-PRODUCT_PACKAGES += \
-    crda \
-    linville.key.pub.pem \
-    regdbdump \
-    regulatory.bin
-
 # Display
 PRODUCT_PACKAGES += \
     copybit.msm8916 \
@@ -85,11 +78,6 @@ PRODUCT_PACKAGES += \
     libtinyxml \
     memtrack.msm8916
 
-# Filesystem
-PRODUCT_PACKAGES += \
-    e2fsck \
-    make_ext4fs
-
 # FM
 PRODUCT_PACKAGES += \
     FMRadio \
@@ -135,9 +123,7 @@ PRODUCT_PACKAGES += \
 
 # Ramdisk
 PRODUCT_PACKAGES += \
-    init.crda.sh \
-    init.qcom.bt.sh \
-    init.qcom.coex.sh
+    init.qcom.bt.sh
 
 PRODUCT_PACKAGES += \
     init.qcom.rc \
@@ -155,10 +141,6 @@ PRODUCT_PACKAGES += \
     librmnetctl \
     libxml2
 
-# USB
-PRODUCT_PACKAGES += \
-    com.android.future.usb.accessory
-
 # Wifi
 PRODUCT_PACKAGES += \
     libqsap_sdk \
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index b3813ce..d88195f 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -3,26 +3,12 @@ LOCAL_PATH:= $(call my-dir)
 # Configuration scripts
 
 include $(CLEAR_VARS)
-LOCAL_MODULE       := init.crda.sh
-LOCAL_MODULE_TAGS  := optional eng
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := etc/init.crda.sh
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
 LOCAL_MODULE       := init.qcom.bt.sh
 LOCAL_MODULE_TAGS  := optional eng
 LOCAL_MODULE_CLASS := ETC
 LOCAL_SRC_FILES    := etc/init.qcom.bt.sh
 include $(BUILD_PREBUILT)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE       := init.qcom.coex.sh
-LOCAL_MODULE_TAGS  := optional eng
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := etc/init.qcom.coex.sh
-include $(BUILD_PREBUILT)
-
 # Init scripts
 
 include $(CLEAR_VARS)
diff --git a/rootdir/etc/init.crda.sh b/rootdir/etc/init.crda.sh
deleted file mode 100644
index d1a4b58..0000000
--- a/rootdir/etc/init.crda.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/system/bin/sh
-# Copyright (c) 2012, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of The Linux Foundation nor
-#       the names of its contributors may be used to endorse or promote
-#       products derived from this software without specific prior written
-#       permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-country=`getprop wlan.crda.country`
-# crda takes input in COUNTRY environment variable
-if [ $country != "" ]
-then
-COUNTRY="$country" /system/bin/crda
-fi
diff --git a/rootdir/etc/init.qcom.coex.sh b/rootdir/etc/init.qcom.coex.sh
deleted file mode 100644
index 9408cd7..0000000
--- a/rootdir/etc/init.qcom.coex.sh
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/system/bin/sh
-# Copyright (c) 2009-2010, 2012, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of The Linux Foundation nor
-#       the names of its contributors may be used to endorse or promote
-#       products derived from this software without specific prior written
-#       permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-LOG_TAG="qcom-bt-wlan-coex"
-LOG_NAME="${0}:"
-
-coex_pid=""
-ath_wlan_supported=`getprop wlan.driver.ath`
-
-loge ()
-{
-  /system/bin/log -t $LOG_TAG -p e "$LOG_NAME $@"
-}
-
-logi ()
-{
-  /system/bin/log -t $LOG_TAG -p i "$LOG_NAME $@"
-}
-
-failed ()
-{
-  loge "$1: exit code $2"
-  exit $2
-}
-
-start_coex ()
-{
-  case "$ath_wlan_supported" in
-      "2")
-       echo "ATH WLAN Chip ID AR6004 is enabled"
-       /system/bin/abtfilt -d -z -n -m -a -w wlan0 &
-      ;;
-      "1")
-       echo "ATH WLAN Chip ID is enabled"
-       # Must have -d -z -n -v -s -w wlan0 parameters for atheros btfilter.
-       /system/bin/abtfilt -d -z -n -v -q -s -w wlan0 &
-      ;;
-      "0")
-       echo "WCN WLAN Chip ID is enabled"
-       # Must have -o turned on to avoid daemon (otherwise we cannot get pid)
-       /system/bin/btwlancoex -o $opt_flags &
-      ;;
-      *)
-       echo "NO WLAN Chip ID is enabled, so enabling ATH as default"
-       # Must have -d -z -n -v -s -w wlan0 parameters for atheros btfilter.
-       /system/bin/abtfilt -d -z -n -v -q -s -w wlan0 &
-      ;;
-  esac
-  coex_pid=$!
-  logi "start_coex: pid = $coex_pid"
-}
-
-kill_coex ()
-{
-  logi "kill_coex: pid = $coex_pid"
-  kill -TERM $coex_pid
-  # this shell doesn't exit now -- wait returns for normal exit
-}
-
-# mimic coex options parsing -- maybe a waste of effort
-USAGE="${0} [-o] [-c] [-r] [-i] [-h]"
-
-while getopts "ocrih" f
-do
-  case $f in
-  o | c | r | i | h)  opt_flags="$opt_flags -$f" ;;
-  \?)     echo $USAGE; exit 1;;
-  esac
-done
-
-# init does SIGTERM on ctl.stop for service
-trap "kill_coex" TERM INT
-
-#Selectively start coex module
-target=`getprop ro.board.platform`
-
-if [ "$target" == "msm8960" ] && [ "$ath_wlan_supported" != "2" ]; then
-     logi "btwlancoex/abtfilt is not needed"
-else
-     # Build settings may not produce the coex executable
-     if ls /system/bin/btwlancoex || ls /system/bin/abtfilt
-     then
-         start_coex
-         wait $coex_pid
-         logi "Coex stopped"
-     else
-         logi "btwlancoex/abtfilt not available"
-     fi
-fi
-exit 0
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 204ef69..b064c30 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -295,7 +295,6 @@ on property:init.svc.wpa_supplicant=stopped
     stop dhcpcd
 
 on property:bluetooth.isEnabled=true
-    start btwlancoex
     write /sys/class/bluetooth/hci0/idle_timeout 7000
 
 on property:vold.decrypt=trigger_restart_framework
@@ -361,13 +360,6 @@ on property:ro.use_data_netmgrd=false
 on property:ro.data.large_tcp_window_size=true
     write /proc/sys/net/ipv4/tcp_adv_win_scale  2
 
-service btwlancoex /system/bin/sh /system/etc/init.qcom.coex.sh
-    class late_start
-    user bluetooth
-    group bluetooth net_bt_admin inet net_admin net_raw
-    disabled
-    oneshot
-
 service p2p_supplicant /system/bin/wpa_supplicant \
     -ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf \
     -I/system/etc/wifi/p2p_supplicant_overlay.conf -N \
@@ -453,12 +445,6 @@ service loc_launcher /system/bin/loc_launcher
     class late_start
     group gps inet net_raw qcom_diag net_admin wifi
 
-service wifi-crda /system/bin/sh /system/etc/init.crda.sh
-   class late_start
-   user root
-   disabled
-   oneshot
-
 service hostapd /system/bin/hostapd -dd /data/hostapd/hostapd.conf
     class late_start
     user root