armani: Move proprietary binaries to vendor

Change-Id: I93616a602194946d347185d961b999ab68609ca7

4 files changed, 39 insertions, 39 deletions

diff --git a/configs/init.armani.bt.sh b/configs/init.armani.bt.sh
index 8e10b3b..2804e23 100644
--- a/configs/init.armani.bt.sh
+++ b/configs/init.armani.bt.sh
@@ -42,9 +42,9 @@ esac
 
 if [$BDADDR == ""]
 then
-/system/bin/hci_qcomm_init -e $PWR_CLASS
+/system/vendor/bin/hci_qcomm_init -e $PWR_CLASS
 else
-/system/bin/hci_qcomm_init -b $BDADDR -e $PWR_CLASS
+/system/vendor/bin/hci_qcomm_init -b $BDADDR -e $PWR_CLASS
 fi
 
 case $? in
diff --git a/device.mk b/device.mk
index 1be760f..3a484ed 100644
--- a/device.mk
+++ b/device.mk
@@ -74,7 +74,7 @@ PRODUCT_PACKAGES += \
     bdaddr_xiaomi
 
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/init.armani.bt.sh:system/bin/init.armani.bt.sh
+    $(LOCAL_PATH)/configs/init.armani.bt.sh:system/vendor/bin/init.armani.bt.sh
 
 # CABL
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -199,7 +199,7 @@ PRODUCT_COPY_FILES += \
 
 # Sensors
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/sensor_def_qcomdev.conf:system/etc/sensor_def_qcomdev.conf
+    $(LOCAL_PATH)/configs/sensor_def_qcomdev.conf:system/vendor/etc/sensor_def_qcomdev.conf
 
 # Storage
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 0799724..5e111d8 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,5 +1,5 @@
 # ADSP
-bin/adsprpcd
+bin/adsprpcd:vendor/bin/adsprpcd
 vendor/lib/libadsprpc.so
 vendor/lib/libfastcvadsp_stub.so
 vendor/lib/libfastcvopt.so
@@ -31,10 +31,10 @@ vendor/lib/soundfx/libqcreverb.so
 vendor/lib/soundfx/libqcvirt.so
 
 # Bluetooth
-bin/hci_qcomm_init
+bin/hci_qcomm_init:vendor/bin/hci_qcomm_init
 
 # Camera
-bin/mm-qcamera-daemon
+bin/mm-qcamera-daemon:vendor/bin/mm-qcamera-daemon
 lib/hw/camera.vendor.msm8226.so|6ac9bd33114fc9f2d3a00eb60ee37ebece82c5b2
 lib/libmmcamera_interface.so
 lib/libmmjpeg_interface.so
@@ -100,7 +100,7 @@ vendor/lib/libchromatix_s5k3h2yx_owt8a01a_video_hd.so
 vendor/lib/libchromatix_s5k3h2yx_owt8a01a_zsl.so
 
 # DRM
-bin/qseecomd
+bin/qseecomd:vendor/bin/qseecomd
 vendor/lib/libdrmdecrypt.so
 vendor/lib/libdrmfs.so
 vendor/lib/libdrmtime.so
@@ -111,9 +111,9 @@ vendor/lib/libssd.so
 # GPS
 -app/com.qualcomm.location/com.qualcomm.location.apk
 -app/com.qualcomm.services.location/com.qualcomm.services.location.apk
-bin/location-mq
-bin/xtwifi-client
-bin/xtwifi-inet-agent
+bin/location-mq:vendor/bin/location-mq
+bin/xtwifi-client:vendor/bin/xtwifi-client
+bin/xtwifi-inet-agent:vendor/bin/xtwifi-inet-agent
 etc/permissions/com.qualcomm.location.xml
 etc/gps.conf
 etc/izat.conf
@@ -176,11 +176,11 @@ vendor/lib/libmmosal.so
 vendor/lib/libSHIMDivxDrm.so
 
 # Perf
-#bin/mpdecision
+#bin/mpdecision:vendor/bin/mpdecision
 vendor/lib/libqti-perfd-client.so
 
 # Qualcomm
-bin/irsc_util
+bin/irsc_util:vendor/bin/irsc_util
 vendor/lib/libdiag.so
 vendor/lib/libdsutils.so
 vendor/lib/libidl.so
@@ -197,11 +197,11 @@ vendor/lib/libqmiservices.so
 vendor/lib/libsmemlog.so
 
 # Radio
-bin/netmgrd
-bin/qmuxd
-bin/radish
-bin/rfs_access
-bin/rmt_storage
+bin/netmgrd:vendor/bin/netmgrd
+bin/qmuxd:vendor/bin/qmuxd
+bin/radish:vendor/bin/radish
+bin/rfs_access:vendor/bin/rfs_access
+bin/rmt_storage:vendor/bin/rmt_storage
 lib/libmdmdetect.so
 vendor/lib/libcneapiclient.so
 vendor/lib/libconfigdb.so
@@ -214,7 +214,7 @@ vendor/lib/libsystem_health_mon.so
 vendor/lib/libxml.so
 
 # Sensors
-bin/sensors.qcom
+bin/sensors.qcom:vendor/bin/sensors.qcom
 vendor/lib/hw/sensors.msm8226.so
 vendor/lib/libAKM8963.so
 vendor/lib/libsensor1.so
@@ -223,13 +223,13 @@ vendor/lib/libsensor_test.so
 vendor/lib/libsensor_user_cal.so
 
 # Thermal
-bin/thermal-engine
+bin/thermal-engine:vendor/bin/thermal-engine
 vendor/lib/libthermalclient.so
 vendor/lib/libthermalioctl.so
 
 # Time services
 -app/TimeService/TimeService.apk
-bin/time_daemon
+bin/time_daemon:vendor/bin/time_daemon
 -vendor/lib/libtime_genoff.so
 vendor/lib/libTimeService.so
 
diff --git a/rootdir/init.armani.rc b/rootdir/init.armani.rc
index 0f348fd..29930bf 100755
--- a/rootdir/init.armani.rc
+++ b/rootdir/init.armani.rc
@@ -216,17 +216,17 @@ on post-fs-data
     chown system system /sys/class/timed_output/vibrator/amp
     chmod 0664 /sys/class/timed_output/vibrator/amp
 
-service irsc_util /system/bin/irsc_util "/etc/sec_config"
+service irsc_util /vendor/bin/irsc_util "/etc/sec_config"
     class main
     user root
     oneshot
 
-service rmt_storage /system/bin/rmt_storage
+service rmt_storage /vendor/bin/rmt_storage
     class core
     user root
     group system wakelock
 
-service rfs_access /system/bin/rfs_access
+service rfs_access /vendor/bin/rfs_access
     class core
     user system
     group system net_raw
@@ -241,7 +241,7 @@ on property:init.svc.bdaddr=stopped
     chmod 644 /data/misc/bluetooth/bdaddr
     chown bluetooth bluetooth /data/misc/bluetooth/bdaddr
 
-service hciattach /system/bin/init.armani.bt.sh
+service hciattach /vendor/bin/init.armani.bt.sh
     class late_start
     user bluetooth
     group qcom_oncrpc bluetooth net_bt_admin system
@@ -255,17 +255,17 @@ on property:bluetooth.hciattach=false
     setprop bluetooth.status off
 
 # QMUX must be in multiple groups to support external process connections
-service qmuxd /system/bin/qmuxd
+service qmuxd /vendor/bin/qmuxd
     class main
     user radio
     group radio audio bluetooth wakelock gps diag qcom_diag
 
-service netmgrd /system/bin/netmgrd
+service netmgrd /vendor/bin/netmgrd
     class main
     user root
     group root wifi wakelock radio inet system
 
-service sensors /system/bin/sensors.qcom
+service sensors /vendor/bin/sensors.qcom
     class late_start
     user root
     group root
@@ -308,27 +308,27 @@ on property:ro.boot.modem=HM1AW
 on property:ro.boot.modem=HM1AC
     setprop ro.telephony.default_network 7
 
-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
 
-service time_daemon /system/bin/time_daemon
+service time_daemon /vendor/bin/time_daemon
     class late_start
     user root
     group root
 
-#service mpdecision /system/bin/mpdecision --avg_comp
+#service mpdecision /vendor/bin/mpdecision --avg_comp
 #    user root
 #    group root system
 #    disabled
 
-service thermal-engine /system/bin/thermal-engine
+service thermal-engine /vendor/bin/thermal-engine
     class main
     user root
     group root
 
-service qseecomd /system/bin/qseecomd
+service qseecomd /vendor/bin/qseecomd
     class core
     user root
     group root
@@ -337,31 +337,31 @@ service audiod /system/bin/audiod
     class late_start
     user system
     group system
-    
-service adsprpcd /system/bin/adsprpcd
+
+service adsprpcd /vendor/bin/adsprpcd
     class main
     user media
     group media
 
-service wcnss-service /system/bin/wcnss_service
+service wcnss-service /vendor/bin/wcnss_service
     class main
     user system
     group system wifi radio
     oneshot
 
-service location_mq /system/bin/location-mq
+service location_mq /vendor/bin/location-mq
     class late_start
     user gps
     group gps
     disabled
 
-service xtwifi_client /system/bin/xtwifi-client
+service xtwifi_client /vendor/bin/xtwifi-client
     class late_start
     user gps
     group net_admin wifi inet gps
     disabled
 
-service xtwifi_inet /system/bin/xtwifi-inet-agent
+service xtwifi_inet /vendor/bin/xtwifi-inet-agent
     class late_start
     user gps
     group inet gps