universal7580: move binary executables to /vendor

Change-Id: I3aa77d616638ff08c8f9eeec2bb37cc96308d19a

diff --git a/extract-files.sh b/extract-files.sh
index 60e53cc262d84f2f0a4788691caa7310ee7902fb..ce2672fe9831a4080c6ef1160b62ec84d8a1c5fa 100755 (executable)
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -70,9 +70,9 @@ extract "${MY_DIR}/proprietary-files-bsp.txt" "${SRC}" \
 
 # Fix proprietary blobs
 BLOB_ROOT="$LINEAGE_ROOT"/vendor/"$VENDOR"/"$DEVICE_COMMON"/proprietary
-patchelf --replace-needed libgui.so libsensor.so $BLOB_ROOT/bin/gpsd
+patchelf --replace-needed libgui.so libsensor.so $BLOB_ROOT/vendor/bin/gpsd
 
 # replace SSLv3_client_method with SSLv23_method
-sed -i "s/SSLv3_client_method/SSLv23_method\x00\x00\x00\x00\x00\x00/" $BLOB_ROOT/bin/gpsd
+sed -i "s/SSLv3_client_method/SSLv23_method\x00\x00\x00\x00\x00\x00/" $BLOB_ROOT/vendor/bin/gpsd
 
 "${MY_DIR}/setup-makefiles.sh"

diff --git a/proprietary-files-bsp.txt b/proprietary-files-bsp.txt
index eaf968ab34c1ad5dac87ca1bdccad0c6b03aff7d..a61e2640ad1f8d2544ad4d2658b176992fb39b22 100644 (file)
--- a/proprietary-files-bsp.txt
+++ b/proprietary-files-bsp.txt
@@ -14,7 +14,7 @@ lib/libhwcutils.so
 lib/libmpp.so
 
 # Mobicore
-bin/mcDriverDaemon
+bin/mcDriverDaemon:vendor/bin/mcDriverDaemon
 lib/libMcClient.so
 lib/libMcRegistry.so
 

diff --git a/proprietary-files.txt b/proprietary-files.txt
index 4488086da5fc77b6a73b02e49c003673a3fa7235..2c117c1ede40f60b52f9c84f958c399d8eaac816 100644 (file)
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -7,8 +7,8 @@ lib/libuniplugin.so
 lib/libsensorlistener.so
 
 # GPS
-bin/gpsd
-bin/gps.cer
+bin/gpsd:vendor/bin/gpsd
+bin/gps.cer:vendor/bin/gps.cer
 lib/hw/gps.default.so:lib/hw/gps.universal7580.so
 lib/libwrappergps.so
 lib/libfloatingfeature.so
@@ -17,7 +17,7 @@ lib/libfloatingfeature.so
 vendor/lib/egl/libGLES_mali.so
 
 # Mobicore
-bin/cs
+bin/cs:vendor/bin/cs
 
 # protobuf
 lib/libprotobuf-cpp-fl26.so|f2436050b38e5acb63d36ad7b24a0c2612d68749

diff --git a/ramdisk/etc/init.baseband.rc b/ramdisk/etc/init.baseband.rc
index 6e008e5352ef96e2fea437ff452a7f2a6a54dbfb..dcadcc32640c713a1b812dfe10097c043b2162a4 100644 (file)
--- a/ramdisk/etc/init.baseband.rc
+++ b/ramdisk/etc/init.baseband.rc
@@ -34,14 +34,14 @@ on fs
     chown radio system /sys/devices/virtual/misc/umts_dm0/dm_state
 
 # Parse hardware revision (needs to happen before cbd starts)
-service modemloader /system/bin/modemloader
+service modemloader /vendor/bin/modemloader
     class core
     oneshot
 
 on property:ro.modemloader.done=1
     enable cpboot-daemon
 
-service cpboot-daemon /system/bin/cbd -d -tss310 -bm -mm -P platform/13540000.dwmmc0/by-name/RADIO
+service cpboot-daemon /vendor/bin/cbd -d -tss310 -bm -mm -P platform/13540000.dwmmc0/by-name/RADIO
     class main
     user root
     group radio cache inet misc audio sdcard_rw log sdcard_r shell

diff --git a/ramdisk/etc/init.samsung.rc b/ramdisk/etc/init.samsung.rc
index 0147fb7cb704cec8c9632779541e8da30cbeffd5..e34ba1e635de37db1e55e2ef15718dbb0ca07da3 100644 (file)
--- a/ramdisk/etc/init.samsung.rc
+++ b/ramdisk/etc/init.samsung.rc
@@ -292,7 +292,7 @@ on boot
     copy /system/etc/battery_charging_temp.data /sys/class/power_supply/battery/batt_temp_table
 
 # MobiCore startup
-service mobicore /system/bin/mcDriverDaemon -r /system/app/FFFFFFFF000000000000000000000001.drbin -r /system/app/mcRegistry/ffffffffd0000000000000000000000a.tlbin -r /system/app/mcRegistry/ffffffffd00000000000000000000016.tlbin
+service mobicore /vendor/bin/mcDriverDaemon -r /vendor/app/FFFFFFFF000000000000000000000001.drbin -r /vendor/app/mcRegistry/ffffffffd0000000000000000000000a.tlbin -r /vendor/app/mcRegistry/ffffffffd00000000000000000000016.tlbin
     class core
     user system
     group system

diff --git a/ramdisk/etc/init.samsungexynos7580.rc b/ramdisk/etc/init.samsungexynos7580.rc
index d9f6cda5896a400cf42ed5d9f97637ad6cca7606..123dcf8668e51452c20729f17f8f1389cdafaaff 100644 (file)
--- a/ramdisk/etc/init.samsungexynos7580.rc
+++ b/ramdisk/etc/init.samsungexynos7580.rc
@@ -793,7 +793,7 @@ on fs
     chown system radio /sys/class/sensors/irled_remote/irled_send_result
 
 # GPS
-service gpsd /system/bin/gpsd -c /system/etc/gps.xml
+service gpsd /vendor/bin/gpsd -c /system/etc/gps.xml
     class main
     user gps
     group system wakelock inet net_raw
@@ -828,7 +828,7 @@ on charger
 
 
 # DRK/CS service
-service cs_service /system/bin/cs
+service cs_service /vendor/bin/cs
     class main
     user system
     group system
@@ -838,7 +838,7 @@ on property:sys.mobicoredaemon.enable=true
     start cs_service
     write /proc/iccc_ready 1
 
-service sswap /system/bin/sswap -s -f 1024
+service sswap /vendor/bin/sswap -s -f 1024
       class core
       user root
       group root

diff --git a/ramdisk/etc/init.wifi.rc b/ramdisk/etc/init.wifi.rc
index c8b48264b04d899ae71f320df87557912c69bbc2..82ebffa9a3cafaf4a761312e7fbffbd3dc378d81 100644 (file)
--- a/ramdisk/etc/init.wifi.rc
+++ b/ramdisk/etc/init.wifi.rc
@@ -43,7 +43,7 @@ on boot
     #write /proc/sys/net/ipv4/tcp_adv_win_scale 2
 
 # Run deferred initcalls of builtin kernel modules (bcmdhd)
-service wifiloader /system/bin/wifiloader
+service wifiloader /vendor/bin/wifiloader
     class main
     oneshot
 

diff --git a/sepolicy/cpboot-daemon.te b/sepolicy/cpboot-daemon.te
index 14886b4588de91c9c79c60daeabeaabec12ef874..6f3721ba6d8fd3beaaafb7038c21ada20ec6a4e0 100644 (file)
--- a/sepolicy/cpboot-daemon.te
+++ b/sepolicy/cpboot-daemon.te
@@ -1,6 +1,6 @@
 # modem daemon sec label
 type cpboot-daemon, domain;
-type cpboot-daemon_exec, exec_type, file_type;
+type cpboot-daemon_exec, exec_type, file_type, vendor_file_type;
 
 net_domain(cpboot-daemon)
 init_daemon_domain(cpboot-daemon)

diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 9a07aefcf0b343dfb6c67e36acde3c9e701db547..863dec55338fae002610ceed8e54c366b2129075 100644 (file)
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -153,13 +153,13 @@
 # deamons
 #
 
-/system/bin/mcDriverDaemon   u:object_r:tee_exec:s0
-/system/bin/modemloader      u:object_r:modemloader_exec:s0
-/system/bin/wifiloader       u:object_r:wifiloader_exec:s0
+/(vendor|system/vendor)/bin/mcDriverDaemon   u:object_r:tee_exec:s0
+/(vendor|system/vendor)/bin/modemloader      u:object_r:modemloader_exec:s0
+/(vendor|system/vendor)/bin/wifiloader       u:object_r:wifiloader_exec:s0
 
-/system/bin/cbd              u:object_r:cpboot-daemon_exec:s0
-/system/bin/gpsd             u:object_r:gpsd_exec:s0
-/system/bin/sswap            u:object_r:sswap_exec:s0
+/(vendor|system/vendor)/bin/cbd              u:object_r:cpboot-daemon_exec:s0
+/(vendor|system/vendor)/bin/gpsd             u:object_r:gpsd_exec:s0
+/(vendor|system/vendor)/bin/sswap            u:object_r:sswap_exec:s0
 
 /(vendor|system/vendor)/bin/hw/vendor\.lineage\.livedisplay@2\.0-service\.samsung-exynos    u:object_r:hal_lineage_livedisplay_sysfs_exec:s0
 /(vendor|system/vendor)/bin/hw/vendor\.lineage\.touch@1\.0-service\.samsung                 u:object_r:hal_lineage_touch_default_exec:s0

diff --git a/sepolicy/gpsd.te b/sepolicy/gpsd.te
index 9c383ff169413b4785cd8216d5f45608f7bd8f15..eb0afa7adce45f15c76abc527f27493af07f7e72 100644 (file)
--- a/sepolicy/gpsd.te
+++ b/sepolicy/gpsd.te
@@ -1,5 +1,5 @@
 type gpsd, domain;
-type gpsd_exec, exec_type, file_type;
+type gpsd_exec, exec_type, file_type, vendor_file_type;
 
 init_daemon_domain(gpsd)
 

diff --git a/sepolicy/modemloader.te b/sepolicy/modemloader.te
index b80869e59ce65add28f9e7529278427c80b6cd9f..8f638908b3f5c7245adcf48c099f8a961c930afe 100644 (file)
--- a/sepolicy/modemloader.te
+++ b/sepolicy/modemloader.te
@@ -1,7 +1,7 @@
 #### modemloader
 #
 type modemloader, domain;
-type modemloader_exec, exec_type, file_type;
+type modemloader_exec, exec_type, file_type, vendor_file_type;
 
 init_daemon_domain(modemloader)
 

diff --git a/sepolicy/sswap.te b/sepolicy/sswap.te
index 49a9ec174a09ccfbe7700cddbb38906bc7adaea7..f5a7a70a45b9d05d09e9c0a5d670d62fd478049e 100644 (file)
--- a/sepolicy/sswap.te
+++ b/sepolicy/sswap.te
@@ -1,5 +1,5 @@
 type sswap, domain;
-type sswap_exec, exec_type, file_type;
+type sswap_exec, exec_type, file_type, vendor_file_type;
 type sswap_device, dev_type;
 
 init_daemon_domain(sswap);

diff --git a/sepolicy/wifiloader.te b/sepolicy/wifiloader.te
index 1eca507d1b5440a8e6300e85153b2bc5bdb81a1c..c07043f392fdf99f02f0c5d94457cb230210994c 100644 (file)
--- a/sepolicy/wifiloader.te
+++ b/sepolicy/wifiloader.te
@@ -1,7 +1,7 @@
 #### wifiloader
 #
 type wifiloader, domain;
-type wifiloader_exec, exec_type, file_type;
+type wifiloader_exec, exec_type, file_type, vendor_file_type;
 
 init_daemon_domain(wifiloader)
 unix_socket_connect(wifiloader, property, init)