Revert "msm8996-common: Move bin files to vendor [2/2]"

This reverts commit a18ae7d8278f9be32946f3f67dbf0c49add82b31.

6 files changed, 64 insertions, 66 deletions

diff --git a/config.fs b/config.fs
index cdc7f4e..6c30fb2 100644
--- a/config.fs
+++ b/config.fs
@@ -1,37 +1,37 @@
 [AID_QTI_DIAG]
 value:2901 
 
-[system/vendor/bin/wcnss_filter]
+[system/bin/wcnss_filter]
 mode: 0755
 user: AID_BLUETOOTH
 group: AID_BLUETOOTH
 caps: BLOCK_SUSPEND
 
-[system/vendor/bin/cnss-daemon]
+[system/bin/cnss-daemon]
 mode: 0755
 user: AID_SYSTEM
 group: AID_SYSTEM
 caps: NET_BIND_SERVICE
 
-[system/vendor/bin/pm-service]
+[system/bin/pm-service]
 mode: 0755
 user: AID_SYSTEM
 group: AID_SYSTEM
 caps: NET_BIND_SERVICE
 
-[system/vendor/bin/imsdatadaemon]
+[system/bin/imsdatadaemon]
 mode: 0755
 user: AID_SYSTEM
 group: AID_SYSTEM
 caps: NET_BIND_SERVICE
 
-[system/vendor/bin/ims_rtp_daemon]
+[system/bin/ims_rtp_daemon]
 mode: 0755
 user: AID_SYSTEM
 group: AID_RADIO
 caps: NET_BIND_SERVICE
 
-[vendor/bin/xtwifi-client]
+[system/bin/xtwifi-client]
 mode: 0755
 user:  AID_GPS
 group: AID_GPS
diff --git a/data-ipa-cfg-mgr/ipacm/src/Android.mk b/data-ipa-cfg-mgr/ipacm/src/Android.mk
index a6ce75d..101df25 100644
--- a/data-ipa-cfg-mgr/ipacm/src/Android.mk
+++ b/data-ipa-cfg-mgr/ipacm/src/Android.mk
@@ -62,7 +62,6 @@ LOCAL_SRC_FILES := IPACM_Main.cpp \
 LOCAL_MODULE := ipacm
 LOCAL_CLANG := false
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_EXECUTABLES)
 
 LOCAL_SHARED_LIBRARIES := libipanat
 LOCAL_SHARED_LIBRARIES += libxml2
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 7ee1f16..44f5664 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,3 +1,34 @@
+bin/rmt_storage
+bin/pm-proxy
+bin/radish
+bin/mm-qcamera-app
+bin/port-bridge
+bin/tftp_server
+bin/hci_qcomm_init
+bin/cnss-daemon
+bin/imscmservice
+bin/cnd
+bin/irsc_util
+bin/msm_irqbalance
+bin/imsdatadaemon
+bin/pm-service
+bin/wcnss_filter
+bin/time_daemon
+bin/loc_launcher
+bin/qmuxd
+bin/adsprpcd
+bin/netmgrd
+bin/ims_rtp_daemon
+bin/sensors.qcom
+bin/ipacm-diag
+bin/mm-qcamera-daemon
+bin/imsqmidaemon
+bin/dpmd
+bin/qseecomd
+bin/energy-awareness
+bin/btnvtool
+bin/xtwifi-client
+bin/xtwifi-inet-agent
 etc/dpm/dpm.conf
 etc/dpm/nsrm/NsrmConfiguration.xml
 etc/xtra_root_cert.pem
@@ -118,37 +149,6 @@ lib64/libextmedia_jni.so
 usr/idc/usf_tsc_ptr.idc
 usr/idc/usf_tsc_ext.idc
 usr/idc/usf_tsc.idc
-vendor/bin/rmt_storage
-vendor/bin/pm-proxy
-vendor/bin/radish
-vendor/bin/mm-qcamera-app
-vendor/bin/port-bridge
-vendor/bin/tftp_server
-vendor/bin/hci_qcomm_init
-vendor/bin/cnss-daemon
-vendor/bin/imscmservice
-vendor/bin/cnd
-vendor/bin/irsc_util
-vendor/bin/msm_irqbalance
-vendor/bin/imsdatadaemon
-vendor/bin/pm-service
-vendor/bin/wcnss_filter
-vendor/bin/time_daemon
-vendor/bin/loc_launcher
-vendor/bin/qmuxd
-vendor/bin/adsprpcd
-vendor/bin/netmgrd
-vendor/bin/ims_rtp_daemon
-vendor/bin/sensors.qcom
-vendor/bin/ipacm-diag
-vendor/bin/mm-qcamera-daemon
-vendor/bin/imsqmidaemon
-vendor/bin/dpmd
-vendor/bin/qseecomd
-vendor/bin/energy-awareness
-vendor/bin/btnvtool
-vendor/bin/xtwifi-client
-vendor/bin/xtwifi-inet-agent
 vendor/bin/pd-mapper
 vendor/bin/qseeproxydaemon
 vendor/bin/qti
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 660297c..9bfec3a 100755
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -521,7 +521,7 @@ on post-fs-data
     chmod 0660 /data/misc/radio/db_check_done
 
 # start camera server as daemon
-service qcamerasvr /system/vendor/bin/mm-qcamera-daemon
+service qcamerasvr /system/bin/mm-qcamera-daemon
     class main
     user camera
     group camera system inet input graphics
@@ -533,13 +533,13 @@ service qvop-daemon /system/bin/qvop-daemon
     group system drmrpc
 
 # start up peripheral manager
-service per_mgr system/vendor/bin/pm-service
+service per_mgr system/bin/pm-service
     class late_start
     user system
     group system
     writepid /dev/cpuset/system-background/tasks
 
-service per_proxy /system/vendor/bin/pm-proxy
+service per_proxy /system/bin/pm-proxy
     class late_start
     user system
     group system
@@ -552,7 +552,7 @@ on property:init.svc.per_mgr=running
 on property:sys.shutdown.requested=*
     stop per_proxy
 
-service qseecomd /system/vendor/bin/qseecomd
+service qseecomd /system/bin/qseecomd
    class core
    user root
    group root
@@ -578,13 +578,13 @@ service thermal-engine /system/vendor/bin/thermal-engine
    group root
    writepid /dev/cpuset/system-background/tasks
 
-service time_daemon /system/vendor/bin/time_daemon
+service time_daemon /system/bin/time_daemon
    class late_start
    user root
    group root
    writepid /dev/cpuset/system-background/tasks
 
-service adsprpcd /system/vendor/bin/adsprpcd
+service adsprpcd /system/bin/adsprpcd
    class main
    user media
    group media
@@ -594,14 +594,14 @@ service audiod /system/bin/audiod
    user system
    group system
 
-service imsqmidaemon /system/vendor/bin/imsqmidaemon
+service imsqmidaemon /system/bin/imsqmidaemon
     class main
     user system
     socket ims_qmid stream 0660 system radio
     group radio net_raw log diag
     writepid /dev/cpuset/system-background/tasks
 
-service imsdatadaemon /system/vendor/bin/imsdatadaemon
+service imsdatadaemon /system/bin/imsdatadaemon
     class main
     user system
     socket ims_datad stream 0660 system radio
@@ -623,14 +623,14 @@ on property:persist.sys.pd_enable=0
 on property:sys.ims.QMI_DAEMON_STATUS=1
     start imsdatadaemon
 
-service ims_rtp_daemon /system/vendor/bin/ims_rtp_daemon
+service ims_rtp_daemon /system/bin/ims_rtp_daemon
     class main
     user system
     socket ims_rtpd stream 0660 system radio
     group radio net_raw diag inet log
     disabled
 
-service imscmservice /system/vendor/bin/imscmservice
+service imscmservice /system/bin/imscmservice
     class main
     user system
     group radio net_raw diag diag log
@@ -692,7 +692,7 @@ service readmac /system/bin/readmac
     group root
     oneshot
 
-service energy-awareness /system/vendor/bin/energy-awareness
+service energy-awareness /system/bin/energy-awareness
     class main
     user root
     group system
@@ -784,24 +784,24 @@ on property:vold.decrypt=trigger_restart_framework
 on property:persist.env.fastdorm.enabled=true
     setprop persist.radio.data_no_toggle 1
 
-service cnd /system/vendor/bin/cnd
+service cnd /system/bin/cnd
     class main
     socket cnd stream 660 root inet
     group root wakelock
     writepid /dev/cpuset/system-background/tasks
 
-service irsc_util /system/vendor/bin/irsc_util "/etc/sec_config"
+service irsc_util /system/bin/irsc_util "/etc/sec_config"
     class core
     user root
     oneshot
 
-service rmt_storage /system/vendor/bin/rmt_storage
+service rmt_storage /system/bin/rmt_storage
     class core
     user root
     group system wakelock
     writepid /dev/cpuset/system-background/tasks
 
-service tftp_server /system/vendor/bin/tftp_server
+service tftp_server /system/bin/tftp_server
     class main
     user root
     writepid /dev/cpuset/system-background/tasks
@@ -812,7 +812,7 @@ on property:wc_transport.start_hci=true
 on property:wc_transport.start_hci=false
     stop start_hci_filter
 
-service start_hci_filter /system/vendor/bin/wcnss_filter
+service start_hci_filter /system/bin/wcnss_filter
     class late_start
     user bluetooth
     group bluetooth diag system wakelock
@@ -853,7 +853,7 @@ service ftmd /system/bin/logwrapper /system/bin/ftmdaemon
     disabled
     oneshot
 
-service port-bridge /system/vendor/bin/port-bridge
+service port-bridge /system/bin/port-bridge
     class main
     user radio system
     group radio system inet
@@ -866,18 +866,18 @@ service qmiproxy /system/bin/qmiproxy
     disabled
 
 # QMUX must be in multiple groups to support external process connections
-service qmuxd /system/vendor/bin/qmuxd
+service qmuxd /system/bin/qmuxd
     class main
     user root
     group radio audio bluetooth gps nfc diag
     writepid /dev/cpuset/system-background/tasks
 
-service netmgrd /system/vendor/bin/netmgrd
+service netmgrd /system/bin/netmgrd
     class main
     group radio system wakelock
     writepid /dev/cpuset/system-background/tasks
 
-service ipacm-diag /system/vendor/bin/ipacm-diag
+service ipacm-diag /system/bin/ipacm-diag
     class main
     user radio
     socket ipacm_log_file dgram 660 radio radio
@@ -897,7 +897,7 @@ service qti /system/vendor/bin/qti
     group radio net_raw diag usb net_admin
     writepid /dev/cpuset/system-background/tasks
 
-service sensors /system/vendor/bin/sensors.qcom
+service sensors /system/bin/sensors.qcom
     class core
     user root
     group root wakelock
@@ -968,7 +968,7 @@ service wifi_fccutild /system/bin/wifi_fccutild
     disabled
     oneshot
 
-service cnss-daemon /system/vendor/bin/cnss-daemon -n -l
+service cnss-daemon /system/bin/cnss-daemon -n -l
     class late_start
     user system
     group system inet net_admin wifi
@@ -981,8 +981,8 @@ service cnss-sh /system/bin/init.cnss.sh
 on property:sys.shutdown.requested=*
     stop cnss-daemon
 
-service loc_launcher /system/vendor/bin/loc_launcher
-    #loc_launcher will start as root and set its uid to gps
+service loc_launcher /system/bin/loc_launcher
+    # loc_launcher will start as root and set its uid to gps
     class late_start
     group gps inet diag wifi
     writepid /dev/cpuset/system-background/tasks
@@ -1115,7 +1115,7 @@ service vm_bms /system/bin/vm_bms
     group root
     disabled
 
-service msm_irqbalance /system/vendor/bin/msm_irqbalance -f /system/vendor/etc/msm_irqbalance.conf
+service msm_irqbalance /system/bin/msm_irqbalance -f /system/vendor/etc/msm_irqbalance.conf
     class main
     user root
     group root
diff --git a/rootdir/etc/init.qcom.sh b/rootdir/etc/init.qcom.sh
index 3feaec5..848f11e 100755
--- a/rootdir/etc/init.qcom.sh
+++ b/rootdir/etc/init.qcom.sh
@@ -80,7 +80,7 @@ start_vm_bms()
 
 start_msm_irqbalance_8939()
 {
-	if [ -f /system/vendor/bin/msm_irqbalance ]; then
+	if [ -f /system/bin/msm_irqbalance ]; then
 		case "$platformid" in
 		    "239" | "294" | "295")
 			start msm_irqbalance;;
@@ -90,7 +90,7 @@ start_msm_irqbalance_8939()
 
 start_msm_irqbalance()
 {
-	if [ -f /system/vendor/bin/msm_irqbalance ]; then
+	if [ -f /system/bin/msm_irqbalance ]; then
 		start msm_irqbalance
 	fi
 }
diff --git a/wifi/Android.mk b/wifi/Android.mk
index 4c04dfe..8876a2b 100644
--- a/wifi/Android.mk
+++ b/wifi/Android.mk
@@ -7,6 +7,5 @@ LOCAL_MODULE_TAGS      := optional
 LOCAL_SRC_FILES        := zuk_readmac.c
 LOCAL_CFLAGS           += -Wall
 LOCAL_SHARED_LIBRARIES := libc libcutils libutils liblog
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_EXECUTABLES)
 include $(BUILD_EXECUTABLE)
 endif