msm8937-common: Move proprietary binaries to vendor

board/qcom-wlan.mk

@@ -6,6 +6,7 @@ BOARD_HOSTAPD_DRIVER := NL80211
 BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_qcwcn
 
 BOARD_WLAN_DEVICE := qcwcn
+PRODUCT_VENDOR_MOVE_ENABLED := true
 
 BOARD_WPA_SUPPLICANT_DRIVER := NL80211
 BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_qcwcn

proprietary-files-qc.txt

@@ -1,5 +1,5 @@
 # ADSP - from santoni (Redmi 4X)
-bin/adsprpcd
+bin/adsprpcd:vendor/bin/adsprpcd
 vendor/lib/libadsp_default_listener.so
 vendor/lib/libadsprpc.so
 vendor/lib/libfastcvadsp_stub.so
@@ -59,7 +59,7 @@ vendor/lib64/soundfx/libqcvirt.so
 
 # CNE - from santoni (Redmi 4X)
 -priv-app/CNEService/CNEService.apk
-bin/cnd
+bin/cnd:vendor/bin/cnd
 etc/cne/SwimConfig.xml
 etc/cne/andsfCne.xml
 etc/cne/wqeclient/ATT/ATT_profile1.xml
@@ -97,14 +97,14 @@ vendor/lib64/libwqe.so
 vendor/lib64/libxml.so
 
 # Charger - from santoni (Redmi 4X)
-bin/hvdcp_opti
+bin/hvdcp_opti:vendor/bin/hvdcp_opti
 
 # Consumer IR - from santoni (Redmi 4X)
 lib/hw/consumerir.default.so
 lib64/hw/consumerir.default.so
 
 # DPM - from santoni (Redmi 4X)
-bin/dpmd
+bin/dpmd:vendor/bin/dpmd
 etc/dpm/dpm.conf
 etc/dpm/nsrm/NsrmConfiguration.xml
 etc/permissions/com.qti.dpmframework.xml
@@ -124,7 +124,7 @@ vendor/lib64/libdpmnsrm.so
 vendor/lib64/libdpmtcm.so
 
 # DRM - from santoni (Redmi 4X)
-bin/qseecomd
+bin/qseecomd:vendor/bin/qseecomd
 vendor/bin/qseeproxydaemon
 vendor/lib/libQSEEComAPI.so
 vendor/lib/libcppf.so
@@ -156,10 +156,10 @@ vendor/lib64/hw/gatekeeper.msm8937.so
 -lib64/libloc_api_v02.so
 -lib64/libloc_ds_api.so
 -priv-app/com.qualcomm.location/com.qualcomm.location.apk
-bin/loc_launcher
+bin/loc_launcher:vendor/bin/loc_launcher
-bin/lowi-server
+bin/lowi-server:vendor/bin/lowi-server
-bin/xtwifi-client
+bin/xtwifi-client:vendor/bin/xtwifi-client
-bin/xtwifi-inet-agent
+bin/xtwifi-inet-agent:vendor/bin/xtwifi-inet-agent
 etc/permissions/com.qti.location.sdk.xml
 etc/permissions/com.qualcomm.location.vzw_library.xml
 etc/permissions/com.qualcomm.location.xml
@@ -348,8 +348,8 @@ vendor/lib64/libconnctrl.so
 vendor/lib64/libQtiTether.so
 
 # Perf - from santoni (Redmi 4X)
-bin/iop
+bin/iop:vendor/bin/iop
-bin/msm_irqbalance
+bin/msm_irqbalance:vendor/bin/msm_irqbalance
 vendor/bin/perfd
 vendor/lib/libqti-iop-client.so
 vendor/lib/libqti-perfd-client.so
@@ -357,8 +357,8 @@ vendor/lib64/libqti-iop-client.so
 vendor/lib64/libqti-perfd-client.so
 
 # Peripheral manager - from santoni (Redmi 4X)
-bin/pm-proxy
+bin/pm-proxy:vendor/bin/pm-proxy
-bin/pm-service
+bin/pm-service:vendor/bin/pm-service
 vendor/lib/libperipheral_client.so
 vendor/lib64/libperipheral_client.so
 
@@ -369,8 +369,8 @@ vendor/lib/libdisp-aba.so
 vendor/lib64/libdisp-aba.so
 
 # QMI - from santoni (Redmi 4X)
-bin/ATFWD-daemon
+bin/ATFWD-daemon:vendor/bin/ATFWD-daemon
-bin/irsc_util
+bin/irsc_util:vendor/bin/irsc_util
 etc/permissions/qti_permissions.xml
 vendor/lib64/lib_rsu.so
 vendor/lib64/libdiag.so
@@ -422,10 +422,10 @@ vendor/lib/libsmemlog.so
 -framework/qti-telephony-common.jar|6a8b6e3b0240429bc9b947bcc4246c837aff06f1
 -framework/QtiTelephonyServicelibrary.jar
 -priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
-bin/netmgrd
+bin/netmgrd:vendor/bin/netmgrd
-bin/radish
+bin/radish:vendor/bin/radish
-bin/rmt_storage
+bin/rmt_storage:vendor/bin/rmt_storage
-bin/tftp_server
+bin/tftp_server:vendor/bin/tftp_server
 etc/data/dsi_config.xml
 etc/data/netmgr_config.xml
 etc/permissions/embms.xml
@@ -452,10 +452,10 @@ vendor/qcril.db
 -vendor/app/ims/ims.apk
 -vendor/app/imssettings/imssettings.apk
 -vendor/framework/qti-vzw-ims-internal.jar
-bin/ims_rtp_daemon
+bin/ims_rtp_daemon:vendor/bin/ims_rtp_daemon
-bin/imscmservice
+bin/imscmservice:vendor/bin/imscmservice
-bin/imsdatadaemon
+bin/imsdatadaemon:vendor/bin/imsdatadaemon
-bin/imsqmidaemon
+bin/imsqmidaemon:vendor/bin/imsqmidaemon
 etc/permissions/imscm.xml
 etc/permissions/qti-vzw-ims-internal.xml
 vendor/lib64/lib-dplmedia.so
@@ -483,7 +483,7 @@ vendor/lib64/librcc.so
 vendor/lib64/libvoice-svc.so
 
 # Sensors - from santoni (Redmi 4X)
-bin/sensors.qcom
+bin/sensors.qcom:vendor/bin/sensors.qcom
 vendor/lib/hw/activity_recognition.msm8937.so
 vendor/lib/libsensor1.so
 vendor/lib/libsensor_reg.so
@@ -503,7 +503,7 @@ vendor/lib64/libthermalioctl.so
 
 # Time services - from santoni (Redmi 4X)
 -app/TimeService/TimeService.apk
-bin/time_daemon
+bin/time_daemon:vendor/bin/time_daemon
 -vendor/lib/libtime_genoff.so
 vendor/lib/libTimeService.so
 -vendor/lib64/libtime_genoff.so
@@ -515,4 +515,4 @@ vendor/lib/libwvdrm_L3.so|7e77482481197997294a834bfbc817a01b6075cd
 vendor/lib/mediadrm/libwvdrmengine.so|70419ce1f8eb6bd3aa36234f8d7e8003569efc9c
 
 # Wi-Fi - from santoni (Redmi 4X)
-bin/wcnss_service
+bin/wcnss_service:vendor/bin/wcnss_service

rootdir/etc/init.qcom.bt.sh

@@ -75,7 +75,7 @@ case $LE_POWER_CLASS in
      logi "LE Power Class: To override, Before turning BT ON; setprop qcom.bt.le_dev_pwr_class <1 or 2 or 3>";;
 esac
 
-eval $(/system/bin/hci_qcomm_init -e $PWR_CLASS $LE_PWR_CLASS && echo "exit_code_hci_qcomm_init=0" || echo "exit_code_hci_qcomm_init=1")
+eval $(/vendor/bin/hci_qcomm_init -e $PWR_CLASS $LE_PWR_CLASS && echo "exit_code_hci_qcomm_init=0" || echo "exit_code_hci_qcomm_init=1")
 
 case $exit_code_hci_qcomm_init in
   0) logi "Bluetooth QSoC firmware download succeeded, $BTS_DEVICE $BTS_TYPE $BTS_BAUD $BTS_ADDRESS";;

rootdir/init.qcom.rc

@@ -269,7 +269,7 @@ service perfd /system/vendor/bin/perfd
     disabled
     socket perfd seqpacket 0666 root system
 
-service iop /system/bin/iop
+service iop /vendor/bin/iop
     class main
     user root
     group root
@@ -294,34 +294,34 @@ on property:vold.decrypt=trigger_restart_framework
 on property:persist.env.fastdorm.enabled=true
     setprop persist.radio.data_no_toggle 1
 
-service cnd /system/bin/cnd
+service cnd /vendor/bin/cnd
     class main
     socket cnd stream 660 root inet
     writepid /dev/cpuset/system-background/tasks
 
-service dpmd /system/bin/dpmd
+service dpmd /vendor/bin/dpmd
     class late_start
     socket dpmd stream 660 root system
     group system readproc
     writepid /dev/cpuset/system-background/tasks
 
-service irsc_util /system/bin/irsc_util "/etc/sec_config"
+service irsc_util /vendor/bin/irsc_util "/etc/sec_config"
     class core
     user root
     oneshot
 
-service rmt_storage /system/bin/rmt_storage
+service rmt_storage /vendor/bin/rmt_storage
     class core
     user root
     group system wakelock
     writepid /dev/cpuset/system-background/tasks
 
-service tftp_server /system/bin/tftp_server
+service tftp_server /vendor/bin/tftp_server
     class main
     user root
     writepid /dev/cpuset/system-background/tasks
 
-service config_bt_addr /system/bin/btnvtool -O
+service config_bt_addr /vendor/bin/btnvtool -O
     class core
     user bluetooth
     group bluetooth radio
@@ -345,7 +345,7 @@ on property:hw.fm.init=0
 on property:hw.fm.init=1
     write /sys/module/radio_iris_transport/parameters/fmsmd_set 1
 
-service netmgrd /system/bin/netmgrd
+service netmgrd /vendor/bin/netmgrd
     class main
     user root
     group root wifi wakelock radio inet
@@ -357,7 +357,7 @@ service qti /system/vendor/bin/qti
     group radio qcom_diag usb
     writepid /dev/cpuset/system-background/tasks
 
-service sensors /system/bin/sensors.qcom
+service sensors /vendor/bin/sensors.qcom
     class core
     user root
     group root
@@ -383,7 +383,7 @@ service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
     disabled
     oneshot
 
-service loc_launcher /system/bin/loc_launcher
+service loc_launcher /vendor/bin/loc_launcher
     #loc_launcher will start as root and set its uid to gps
     class late_start
     group gps inet net_raw qcom_diag net_admin wifi
@@ -405,7 +405,7 @@ service charger /charger
     group system graphics
     seclabel u:r:healthd:s0
 
-service msm_irqbalance /system/bin/msm_irqbalance -f /system/vendor/etc/msm_irqbalance.conf
+service msm_irqbalance /vendor/bin/msm_irqbalance -f /system/vendor/etc/msm_irqbalance.conf
     class late_start
     user root
     group root
@@ -417,7 +417,7 @@ service qseeproxydaemon /system/vendor/bin/qseeproxydaemon
     group system
     writepid /dev/cpuset/system-background/tasks
 
-service gx_fpd /system/bin/gx_fpd
+service gx_fpd /vendor/bin/gx_fpd
     class core
     user root
     group system system
@@ -438,7 +438,7 @@ on property:persist.sys.fp.onstart=1
 on property:ro.boot.fpsensor=gdx
     setprop ro.hardware.fingerprint goodix
 
-service time_daemon /system/bin/time_daemon
+service time_daemon /vendor/bin/time_daemon
     class main
     user root
     group root

rootdir/init.target.rc

@@ -58,7 +58,7 @@ on post-fs-data
     mkdir /data/misc/dts 0770 media audio
 
 # Start camera server as daemon
-service qcamerasvr /system/bin/mm-qcamera-daemon
+service qcamerasvr /vendor/bin/mm-qcamera-daemon
     class late_start
     user camera
     group camera system inet input graphics
@@ -71,7 +71,7 @@ on property:persist.usb.chgdisabled=1
 on property:persist.usb.chgdisabled=0
     write /sys/class/power_supply/battery/charging_enabled 1
 
-service qseecomd /system/bin/qseecomd
+service qseecomd /vendor/bin/qseecomd
     class core
     user root
     group root
@@ -89,19 +89,19 @@ service audiod /system/bin/audiod
     user system
     group system
 
-service wcnss-service /system/bin/wcnss_service
+service wcnss-service /vendor/bin/wcnss_service
     class main
     user system
     group system wifi radio
     oneshot
 
-service imsqmidaemon /system/bin/imsqmidaemon
+service imsqmidaemon /vendor/bin/imsqmidaemon
     class main
     user system
     socket ims_qmid stream 0660 system radio
     group radio log diag
 
-service imsdatadaemon /system/bin/imsdatadaemon
+service imsdatadaemon /vendor/bin/imsdatadaemon
     class main
     user system
     socket ims_datad stream 0660 system radio
@@ -112,14 +112,14 @@ service imsdatadaemon /system/bin/imsdatadaemon
 on property:sys.ims.QMI_DAEMON_STATUS=1
     start imsdatadaemon
 
-service ims_rtp_daemon /system/bin/ims_rtp_daemon
+service ims_rtp_daemon /vendor/bin/ims_rtp_daemon
     class main
     user system
     socket ims_rtpd stream 0660 system radio
     group radio diag diag inet log
     disabled
 
-service imscmservice /system/bin/imscmservice
+service imscmservice /vendor/bin/imscmservice
     class main
     user system
     group radio diag inet log
@@ -169,18 +169,18 @@ service hbtp /system/vendor/bin/hbtp_daemon
     group system
     disabled
 
-service adsprpcd /system/bin/adsprpcd
+service adsprpcd /vendor/bin/adsprpcd
     class main
     user media
     group media
 
-service per_mgr /system/bin/pm-service
+service per_mgr /vendor/bin/pm-service
     class core
     user system
     group system net_raw
     writepid /dev/cpuset/system-background/tasks
 
-service hvdcp_opti /system/bin/hvdcp_opti
+service hvdcp_opti /vendor/bin/hvdcp_opti
     class main
     user root
     group root