marlin: moved qcom-specific files from system to vendor partition
/system/bin/ATFWD-daemon -> /vendor/bin/ATFWD-daemon
/system/bin/WifiLogger_app -> /vendor/bin/WifiLogger_app
/system/bin/athdiag -> /vendor/bin/athdiag
/system/bin/diag_mdlog -> /vendor/bin/diag_mdlog
/system/bin/ftmdaemon -> /vendor/bin/ftmdaemon
/system/bin/mdm_helper -> /vendor/bin/mdm_helper
/system/bin/mdm_helper_proxy -> /vendor/bin/mdm_helper_proxy
/system/bin/mm-qcamera-daemon -> /vendor/bin/mm-qcamera-daemon
/system/bin/qfipsverify -> /vendor/bin/qfipsverify
/system/bin/qsee_logger -> /vendor/bin/qsee_logger
/system/bin/radish -> /vendor/bin/radish
/system/bin/smlog_dump -> /vendor/bin/smlog_dump
/system/bin/ssr_diag -> /vendor/bin/ssr_diag
/system/bin/wdsdaemon -> /vendor/bin/wdsdaemon
/system/etc/firmwware/nvm* and rampatch* -> /vendor/firmware/*
/system/etc/qdcm_calib_data_*.xml -> /vendor/etc/qdcm_calib_data_*.xml
/system/lib/libmm-qcamera.so -> /vendor/lib/libmm-qcamera.so
/system/usr/qfipsverify/*.hmac -> /vendor/etc/qfipsverify/*.hmac
Bug: 36856960
Bug: 36876666
Test: WIP
Change-Id: Icee7cc9a312df85ae8d11724f6154be3e21d4e6a
diff --git a/camera/QCamera2/stack/mm-camera-test/Android.mk b/camera/QCamera2/stack/mm-camera-test/Android.mk
index 2d77f38..f3f3a90 100644
--- a/camera/QCamera2/stack/mm-camera-test/Android.mk
+++ b/camera/QCamera2/stack/mm-camera-test/Android.mk
@@ -188,6 +188,8 @@
LOCAL_MODULE:= libmm-qcamera
+LOCAL_PROPRIETARY_MODULE := true
+
include $(BUILD_SHARED_LIBRARY)
# Build cam_semaphore_tests
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index 906107a..839d962 100755
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -53,7 +53,7 @@
return;
}
/* Check if smlog_dump tool exist */
- if (!PropertiesHelper::IsUserBuild() && !access("/system/bin/smlog_dump", X_OK)) {
+ if (!PropertiesHelper::IsUserBuild() && !access("/vendor/bin/smlog_dump", X_OK)) {
modemLogsEnabled = android::base::GetBoolProperty(MODEM_LOGGING_SWITCH, false);
/* Execute SMLOG DUMP if SMLOG is enabled */
@@ -122,7 +122,7 @@
DumpFileToFd(fd, "MDP xlogs", "/d/mdp/xlog/dump");
/* Check if qsee_logger tool exists */
- if (!access("/system/bin/qsee_logger", X_OK)) {
+ if (!access("/vendor/bin/qsee_logger", X_OK)) {
RunCommandToFd(fd, "FP LOGS", {"qsee_logger", "-d"});
}
diff --git a/init.common.rc b/init.common.rc
index 5a333f1..76a39de 100644
--- a/init.common.rc
+++ b/init.common.rc
@@ -690,26 +690,26 @@
group root
writepid /dev/cpuset/system-background/tasks
-service atfwd /system/bin/ATFWD-daemon
+service atfwd /vendor/bin/ATFWD-daemon
class late_start
user system
group system radio
disabled
-service ssr_diag /system/bin/ssr_diag
+service ssr_diag /vendor/bin/ssr_diag
class late_start
user system
group system
disabled
-service diag_mdlog_start /system/bin/diag_mdlog
+service diag_mdlog_start /vendor/bin/diag_mdlog
class late_start
user shell
group system diag sdcard_rw sdcard_r media_rw
disabled
oneshot
-service diag_mdlog_stop /system/bin/diag_mdlog -k
+service diag_mdlog_stop /vendor/bin/diag_mdlog -k
class late_start
user shell
group system diag sdcard_rw sdcard_r media_rw
diff --git a/marlin/android_filesystem_config.h b/marlin/android_filesystem_config.h
index 4c45212..e6e127e 100644
--- a/marlin/android_filesystem_config.h
+++ b/marlin/android_filesystem_config.h
@@ -32,7 +32,7 @@
** and will allow partial matches.
*/
static const struct fs_path_config android_device_files[] = {
- { 00700, AID_CAMERA, AID_SHELL, (1ULL << CAP_SYS_NICE), "system/bin/mm-qcamera-daemon" },
+ { 00700, AID_CAMERA, AID_SHELL, (1ULL << CAP_SYS_NICE), "vendor/bin/mm-qcamera-daemon" },
{ 00755, AID_SYSTEM, AID_SYSTEM, (1ULL << CAP_NET_BIND_SERVICE), "vendor/bin/pm-service" },
{ 00755, AID_SYSTEM, AID_SYSTEM, (1ULL << CAP_NET_BIND_SERVICE), "vendor/bin/imsdatadaemon" },
{ 00755, AID_SYSTEM, AID_RADIO, (1ULL << CAP_NET_BIND_SERVICE), "vendor/bin/ims_rtp_daemon" },
diff --git a/sailfish/android_filesystem_config.h b/sailfish/android_filesystem_config.h
index 4c45212..e6e127e 100644
--- a/sailfish/android_filesystem_config.h
+++ b/sailfish/android_filesystem_config.h
@@ -32,7 +32,7 @@
** and will allow partial matches.
*/
static const struct fs_path_config android_device_files[] = {
- { 00700, AID_CAMERA, AID_SHELL, (1ULL << CAP_SYS_NICE), "system/bin/mm-qcamera-daemon" },
+ { 00700, AID_CAMERA, AID_SHELL, (1ULL << CAP_SYS_NICE), "vendor/bin/mm-qcamera-daemon" },
{ 00755, AID_SYSTEM, AID_SYSTEM, (1ULL << CAP_NET_BIND_SERVICE), "vendor/bin/pm-service" },
{ 00755, AID_SYSTEM, AID_SYSTEM, (1ULL << CAP_NET_BIND_SERVICE), "vendor/bin/imsdatadaemon" },
{ 00755, AID_SYSTEM, AID_RADIO, (1ULL << CAP_NET_BIND_SERVICE), "vendor/bin/ims_rtp_daemon" },
diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt
index b5d92f9..e99a3a0 100644
--- a/self-extractors/extract-lists.txt
+++ b/self-extractors/extract-lists.txt
@@ -6,7 +6,6 @@
qcom)
TO_EXTRACT="\
system/bin/adsprpcd \
- system/bin/ATFWD-daemon \
system/bin/athdiag \
system/bin/cnd \
system/bin/cnss-daemon \
@@ -16,7 +15,6 @@
system/bin/diag_mdlog \
system/bin/diag_socket_log \
system/bin/diag_uart_log \
- system/bin/ftmdaemon \
system/bin/gptest \
system/bin/imscmservice \
system/bin/imsdatadaemon \
@@ -26,32 +24,22 @@
system/bin/loc_launcher \
system/bin/lowi-server \
system/bin/mct-unit-test-app \
- system/bin/mdm_helper \
- system/bin/mdm_helper_proxy \
- system/bin/mm-qcamera-daemon \
system/bin/netmgrd \
system/bin/nl_listener \
system/bin/pktlogconf \
- system/bin/PktRspTest \
system/bin/pm-proxy \
system/bin/pm-service \
system/bin/port-bridge \
- system/bin/qfipsverify \
system/bin/qmi_simple_ril_test \
system/bin/qseecom_sample_client \
- system/bin/radish \
system/bin/rmt_storage \
- system/bin/ssr_diag \
system/bin/ssr_setup \
system/bin/StoreKeybox \
system/bin/subsystem_ramdump \
system/bin/tbaseLoader \
system/bin/test_bet_8996 \
- system/bin/test_diag \
system/bin/test_module_pproc \
system/bin/time_daemon \
- system/bin/wdsdaemon \
- system/bin/WifiLogger_app \
system/etc/acdbdata/Bluetooth_cal.acdb \
system/etc/acdbdata/General_cal.acdb \
system/etc/acdbdata/Global_cal.acdb \
@@ -76,16 +64,6 @@
system/etc/firmware/cpp_firmware_v1_5_2.fw \
system/etc/firmware/cpp_firmware_v1_6_0.fw \
system/etc/firmware/cpp_firmware_v1_8_0.fw \
- system/etc/firmware/nvm_tlv_1.3.bin \
- system/etc/firmware/nvm_tlv_2.1.bin \
- system/etc/firmware/nvm_tlv_3.0.bin \
- system/etc/firmware/nvm_tlv_3.2.bin \
- system/etc/firmware/nvm_tlv.bin \
- system/etc/firmware/rampatch_tlv_1.3.tlv \
- system/etc/firmware/rampatch_tlv_2.1.tlv \
- system/etc/firmware/rampatch_tlv_3.0.tlv \
- system/etc/firmware/rampatch_tlv_3.2.tlv \
- system/etc/firmware/rampatch_tlv.img \
system/etc/firmware/tfa98xx.cnt \
system/etc/flp.conf \
system/etc/izat.conf \
@@ -99,7 +77,6 @@
system/etc/permissions/rcsservice.xml \
system/etc/permissions/telephonyservice.xml \
system/etc/permissions/vzw_sso_permissions.xml \
- system/etc/qdcm_calib_data_M1_WQHD_SAMSUNG_S6E3HA3_5.5_command_mode_panel.xml \
system/etc/sap.conf \
system/framework/com.android.ims.rcsmanager.jar \
system/framework/embmslibrary.jar \
@@ -122,10 +99,7 @@
system/lib/libloc_ds_api.so \
system/lib/libloc_eng.so \
system/lib/libminui.so \
- system/lib/libmm-qcamera.so \
system/lib/libtinyxml.so \
- system/usr/qfipsverify/bootimg.hmac \
- system/usr/qfipsverify/qfipsverify.hmac \
system/lib64/libfmq.so \
system/lib/libfmq.so \
system/lib64/android.hardware.audio@2.0.so \
diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk
index 04c6d3c..707ddc3 100644
--- a/self-extractors/qcom/staging/device-partial.mk
+++ b/self-extractors/qcom/staging/device-partial.mk
@@ -15,7 +15,6 @@
# blob(s) necessary for Marlin hardware
PRODUCT_COPY_FILES := \
vendor/qcom/marlin/proprietary/adsprpcd:system/bin/adsprpcd:qcom \
- vendor/qcom/marlin/proprietary/ATFWD-daemon:system/bin/ATFWD-daemon:qcom \
vendor/qcom/marlin/proprietary/athdiag:system/bin/athdiag:qcom \
vendor/qcom/marlin/proprietary/cnd:system/bin/cnd:qcom \
vendor/qcom/marlin/proprietary/cnss-daemon:system/bin/cnss-daemon:qcom \
@@ -25,7 +24,6 @@
vendor/qcom/marlin/proprietary/diag_mdlog:system/bin/diag_mdlog:qcom \
vendor/qcom/marlin/proprietary/diag_socket_log:system/bin/diag_socket_log:qcom \
vendor/qcom/marlin/proprietary/diag_uart_log:system/bin/diag_uart_log:qcom \
- vendor/qcom/marlin/proprietary/ftmdaemon:system/bin/ftmdaemon:qcom \
vendor/qcom/marlin/proprietary/gptest:system/bin/gptest:qcom \
vendor/qcom/marlin/proprietary/imscmservice:system/bin/imscmservice:qcom \
vendor/qcom/marlin/proprietary/imsdatadaemon:system/bin/imsdatadaemon:qcom \
@@ -35,32 +33,22 @@
vendor/qcom/marlin/proprietary/loc_launcher:system/bin/loc_launcher:qcom \
vendor/qcom/marlin/proprietary/lowi-server:system/bin/lowi-server:qcom \
vendor/qcom/marlin/proprietary/mct-unit-test-app:system/bin/mct-unit-test-app:qcom \
- vendor/qcom/marlin/proprietary/mdm_helper:system/bin/mdm_helper:qcom \
- vendor/qcom/marlin/proprietary/mdm_helper_proxy:system/bin/mdm_helper_proxy:qcom \
- vendor/qcom/marlin/proprietary/mm-qcamera-daemon:system/bin/mm-qcamera-daemon:qcom \
vendor/qcom/marlin/proprietary/netmgrd:system/bin/netmgrd:qcom \
vendor/qcom/marlin/proprietary/nl_listener:system/bin/nl_listener:qcom \
vendor/qcom/marlin/proprietary/pktlogconf:system/bin/pktlogconf:qcom \
- vendor/qcom/marlin/proprietary/PktRspTest:system/bin/PktRspTest:qcom \
vendor/qcom/marlin/proprietary/pm-proxy:system/bin/pm-proxy:qcom \
vendor/qcom/marlin/proprietary/pm-service:system/bin/pm-service:qcom \
vendor/qcom/marlin/proprietary/port-bridge:system/bin/port-bridge:qcom \
- vendor/qcom/marlin/proprietary/qfipsverify:system/bin/qfipsverify:qcom \
vendor/qcom/marlin/proprietary/qmi_simple_ril_test:system/bin/qmi_simple_ril_test:qcom \
vendor/qcom/marlin/proprietary/qseecom_sample_client:system/bin/qseecom_sample_client:qcom \
- vendor/qcom/marlin/proprietary/radish:system/bin/radish:qcom \
vendor/qcom/marlin/proprietary/rmt_storage:system/bin/rmt_storage:qcom \
- vendor/qcom/marlin/proprietary/ssr_diag:system/bin/ssr_diag:qcom \
vendor/qcom/marlin/proprietary/ssr_setup:system/bin/ssr_setup:qcom \
vendor/qcom/marlin/proprietary/StoreKeybox:system/bin/StoreKeybox:qcom \
vendor/qcom/marlin/proprietary/subsystem_ramdump:system/bin/subsystem_ramdump:qcom \
vendor/qcom/marlin/proprietary/tbaseLoader:system/bin/tbaseLoader:qcom \
vendor/qcom/marlin/proprietary/test_bet_8996:system/bin/test_bet_8996:qcom \
- vendor/qcom/marlin/proprietary/test_diag:system/bin/test_diag:qcom \
vendor/qcom/marlin/proprietary/test_module_pproc:system/bin/test_module_pproc:qcom \
vendor/qcom/marlin/proprietary/time_daemon:system/bin/time_daemon:qcom \
- vendor/qcom/marlin/proprietary/wdsdaemon:system/bin/wdsdaemon:qcom \
- vendor/qcom/marlin/proprietary/WifiLogger_app:system/bin/WifiLogger_app:qcom \
vendor/qcom/marlin/proprietary/Bluetooth_cal.acdb:system/etc/acdbdata/Bluetooth_cal.acdb:qcom \
vendor/qcom/marlin/proprietary/General_cal.acdb:system/etc/acdbdata/General_cal.acdb:qcom \
vendor/qcom/marlin/proprietary/Global_cal.acdb:system/etc/acdbdata/Global_cal.acdb:qcom \
@@ -85,16 +73,6 @@
vendor/qcom/marlin/proprietary/cpp_firmware_v1_5_2.fw:system/etc/firmware/cpp_firmware_v1_5_2.fw:qcom \
vendor/qcom/marlin/proprietary/cpp_firmware_v1_6_0.fw:system/etc/firmware/cpp_firmware_v1_6_0.fw:qcom \
vendor/qcom/marlin/proprietary/cpp_firmware_v1_8_0.fw:system/etc/firmware/cpp_firmware_v1_8_0.fw:qcom \
- vendor/qcom/marlin/proprietary/nvm_tlv_1.3.bin:system/etc/firmware/nvm_tlv_1.3.bin:qcom \
- vendor/qcom/marlin/proprietary/nvm_tlv_2.1.bin:system/etc/firmware/nvm_tlv_2.1.bin:qcom \
- vendor/qcom/marlin/proprietary/nvm_tlv_3.0.bin:system/etc/firmware/nvm_tlv_3.0.bin:qcom \
- vendor/qcom/marlin/proprietary/nvm_tlv_3.2.bin:system/etc/firmware/nvm_tlv_3.2.bin:qcom \
- vendor/qcom/marlin/proprietary/nvm_tlv.bin:system/etc/firmware/nvm_tlv.bin:qcom \
- vendor/qcom/marlin/proprietary/rampatch_tlv_1.3.tlv:system/etc/firmware/rampatch_tlv_1.3.tlv:qcom \
- vendor/qcom/marlin/proprietary/rampatch_tlv_2.1.tlv:system/etc/firmware/rampatch_tlv_2.1.tlv:qcom \
- vendor/qcom/marlin/proprietary/rampatch_tlv_3.0.tlv:system/etc/firmware/rampatch_tlv_3.0.tlv:qcom \
- vendor/qcom/marlin/proprietary/rampatch_tlv_3.2.tlv:system/etc/firmware/rampatch_tlv_3.2.tlv:qcom \
- vendor/qcom/marlin/proprietary/rampatch_tlv.img:system/etc/firmware/rampatch_tlv.img:qcom \
vendor/qcom/marlin/proprietary/tfa98xx.cnt:system/etc/firmware/tfa98xx.cnt:qcom \
vendor/qcom/marlin/proprietary/flp.conf:system/etc/flp.conf:qcom \
vendor/qcom/marlin/proprietary/izat.conf:system/etc/izat.conf:qcom \
@@ -108,7 +86,6 @@
vendor/qcom/marlin/proprietary/rcsservice.xml:system/etc/permissions/rcsservice.xml:qcom \
vendor/qcom/marlin/proprietary/telephonyservice.xml:system/etc/permissions/telephonyservice.xml:qcom \
vendor/qcom/marlin/proprietary/vzw_sso_permissions.xml:system/etc/permissions/vzw_sso_permissions.xml:qcom \
- vendor/qcom/marlin/proprietary/qdcm_calib_data_M1_WQHD_SAMSUNG_S6E3HA3_5.5_command_mode_panel.xml:system/etc/qdcm_calib_data_M1_WQHD_SAMSUNG_S6E3HA3_5.5_command_mode_panel.xml:qcom \
vendor/qcom/marlin/proprietary/sap.conf:system/etc/sap.conf:qcom \
vendor/qcom/marlin/proprietary/com.android.ims.rcsmanager.jar:system/framework/com.android.ims.rcsmanager.jar:qcom \
vendor/qcom/marlin/proprietary/embmslibrary.jar:system/framework/embmslibrary.jar:qcom \
@@ -131,10 +108,7 @@
vendor/qcom/marlin/proprietary/libloc_ds_api.so:system/lib/libloc_ds_api.so:qcom \
vendor/qcom/marlin/proprietary/libloc_eng.so:system/lib/libloc_eng.so:qcom \
vendor/qcom/marlin/proprietary/libminui.so:system/lib/libminui.so:qcom \
- vendor/qcom/marlin/proprietary/libmm-qcamera.so:system/lib/libmm-qcamera.so:qcom \
vendor/qcom/marlin/proprietary/libtinyxml.so:system/lib/libtinyxml.so:qcom \
- vendor/qcom/marlin/proprietary/bootimg.hmac:system/usr/qfipsverify/bootimg.hmac:qcom \
- vendor/qcom/marlin/proprietary/qfipsverify.hmac:system/usr/qfipsverify/qfipsverify.hmac:qcom \
vendor/qcom/marlin/proprietary/lib64/libfmq.so:system/lib64/libfmq.so:qcom \
vendor/qcom/marlin/proprietary/libfmq.so:system/lib/libfmq.so:qcom \
vendor/qcom/marlin/proprietary/lib64/android.hardware.audio@2.0.so:system/lib64/android.hardware.audio@2.0.so:qcom \
diff --git a/self-extractors_sailfish/extract-lists.txt b/self-extractors_sailfish/extract-lists.txt
index a2f5e92..f67f8f8 100644
--- a/self-extractors_sailfish/extract-lists.txt
+++ b/self-extractors_sailfish/extract-lists.txt
@@ -6,7 +6,6 @@
qcom)
TO_EXTRACT="\
system/bin/adsprpcd \
- system/bin/ATFWD-daemon \
system/bin/athdiag \
system/bin/cnd \
system/bin/cnss-daemon \
@@ -16,7 +15,6 @@
system/bin/diag_mdlog \
system/bin/diag_socket_log \
system/bin/diag_uart_log \
- system/bin/ftmdaemon \
system/bin/gptest \
system/bin/imscmservice \
system/bin/imsdatadaemon \
@@ -26,33 +24,23 @@
system/bin/loc_launcher \
system/bin/lowi-server \
system/bin/mct-unit-test-app \
- system/bin/mdm_helper \
- system/bin/mdm_helper_proxy \
- system/bin/mm-qcamera-daemon \
system/bin/nanotool \
system/bin/netmgrd \
system/bin/nl_listener \
system/bin/pktlogconf \
- system/bin/PktRspTest \
system/bin/pm-proxy \
system/bin/pm-service \
system/bin/port-bridge \
- system/bin/qfipsverify \
system/bin/qmi_simple_ril_test \
system/bin/qseecom_sample_client \
- system/bin/radish \
system/bin/rmt_storage \
- system/bin/ssr_diag \
system/bin/ssr_setup \
system/bin/StoreKeybox \
system/bin/subsystem_ramdump \
system/bin/tbaseLoader \
system/bin/test_bet_8996 \
- system/bin/test_diag \
system/bin/test_module_pproc \
system/bin/time_daemon \
- system/bin/wdsdaemon \
- system/bin/WifiLogger_app \
system/etc/acdbdata/Bluetooth_cal.acdb \
system/etc/acdbdata/General_cal.acdb \
system/etc/acdbdata/Global_cal.acdb \
@@ -77,16 +65,6 @@
system/etc/firmware/cpp_firmware_v1_5_2.fw \
system/etc/firmware/cpp_firmware_v1_6_0.fw \
system/etc/firmware/cpp_firmware_v1_8_0.fw \
- system/etc/firmware/nvm_tlv_1.3.bin \
- system/etc/firmware/nvm_tlv_2.1.bin \
- system/etc/firmware/nvm_tlv_3.0.bin \
- system/etc/firmware/nvm_tlv_3.2.bin \
- system/etc/firmware/nvm_tlv.bin \
- system/etc/firmware/rampatch_tlv_1.3.tlv \
- system/etc/firmware/rampatch_tlv_2.1.tlv \
- system/etc/firmware/rampatch_tlv_3.0.tlv \
- system/etc/firmware/rampatch_tlv_3.2.tlv \
- system/etc/firmware/rampatch_tlv.img \
system/etc/firmware/tfa98xx.cnt \
system/etc/flp.conf \
system/etc/izat.conf \
@@ -100,7 +78,6 @@
system/etc/permissions/rcsservice.xml \
system/etc/permissions/telephonyservice.xml \
system/etc/permissions/vzw_sso_permissions.xml \
- system/etc/qdcm_calib_data_S1_FHD_SAMSUNG_EA8064TG_5.0_command_mode_panel.xml \
system/etc/sap.conf \
system/framework/com.android.ims.rcsmanager.jar \
system/framework/embmslibrary.jar \
@@ -123,10 +100,7 @@
system/lib/libloc_ds_api.so \
system/lib/libloc_eng.so \
system/lib/libminui.so \
- system/lib/libmm-qcamera.so \
system/lib/libtinyxml.so \
- system/usr/qfipsverify/bootimg.hmac \
- system/usr/qfipsverify/qfipsverify.hmac \
system/lib64/android.hardware.biometrics.fingerprint@2.1.so \
system/lib64/android.hardware.camera.device@1.0.so \
system/lib64/android.hardware.configstore@1.0.so \
diff --git a/self-extractors_sailfish/qcom/staging/device-partial.mk b/self-extractors_sailfish/qcom/staging/device-partial.mk
index 425314d..c75b835 100644
--- a/self-extractors_sailfish/qcom/staging/device-partial.mk
+++ b/self-extractors_sailfish/qcom/staging/device-partial.mk
@@ -15,7 +15,6 @@
# blob(s) necessary for Dragon hardware
PRODUCT_COPY_FILES := \
vendor/qcom/sailfish/proprietary/adsprpcd:system/bin/adsprpcd:qcom \
- vendor/qcom/sailfish/proprietary/ATFWD-daemon:system/bin/ATFWD-daemon:qcom \
vendor/qcom/sailfish/proprietary/athdiag:system/bin/athdiag:qcom \
vendor/qcom/sailfish/proprietary/cnd:system/bin/cnd:qcom \
vendor/qcom/sailfish/proprietary/cnss-daemon:system/bin/cnss-daemon:qcom \
@@ -25,7 +24,6 @@
vendor/qcom/sailfish/proprietary/diag_mdlog:system/bin/diag_mdlog:qcom \
vendor/qcom/sailfish/proprietary/diag_socket_log:system/bin/diag_socket_log:qcom \
vendor/qcom/sailfish/proprietary/diag_uart_log:system/bin/diag_uart_log:qcom \
- vendor/qcom/sailfish/proprietary/ftmdaemon:system/bin/ftmdaemon:qcom \
vendor/qcom/sailfish/proprietary/gptest:system/bin/gptest:qcom \
vendor/qcom/sailfish/proprietary/imscmservice:system/bin/imscmservice:qcom \
vendor/qcom/sailfish/proprietary/imsdatadaemon:system/bin/imsdatadaemon:qcom \
@@ -35,33 +33,23 @@
vendor/qcom/sailfish/proprietary/loc_launcher:system/bin/loc_launcher:qcom \
vendor/qcom/sailfish/proprietary/lowi-server:system/bin/lowi-server:qcom \
vendor/qcom/sailfish/proprietary/mct-unit-test-app:system/bin/mct-unit-test-app:qcom \
- vendor/qcom/sailfish/proprietary/mdm_helper:system/bin/mdm_helper:qcom \
- vendor/qcom/sailfish/proprietary/mdm_helper_proxy:system/bin/mdm_helper_proxy:qcom \
- vendor/qcom/sailfish/proprietary/mm-qcamera-daemon:system/bin/mm-qcamera-daemon:qcom \
vendor/qcom/sailfish/proprietary/nanotool:system/bin/nanotool:qcom \
vendor/qcom/sailfish/proprietary/netmgrd:system/bin/netmgrd:qcom \
vendor/qcom/sailfish/proprietary/nl_listener:system/bin/nl_listener:qcom \
vendor/qcom/sailfish/proprietary/pktlogconf:system/bin/pktlogconf:qcom \
- vendor/qcom/sailfish/proprietary/PktRspTest:system/bin/PktRspTest:qcom \
vendor/qcom/sailfish/proprietary/pm-proxy:system/bin/pm-proxy:qcom \
vendor/qcom/sailfish/proprietary/pm-service:system/bin/pm-service:qcom \
vendor/qcom/sailfish/proprietary/port-bridge:system/bin/port-bridge:qcom \
- vendor/qcom/sailfish/proprietary/qfipsverify:system/bin/qfipsverify:qcom \
vendor/qcom/sailfish/proprietary/qmi_simple_ril_test:system/bin/qmi_simple_ril_test:qcom \
vendor/qcom/sailfish/proprietary/qseecom_sample_client:system/bin/qseecom_sample_client:qcom \
- vendor/qcom/sailfish/proprietary/radish:system/bin/radish:qcom \
vendor/qcom/sailfish/proprietary/rmt_storage:system/bin/rmt_storage:qcom \
- vendor/qcom/sailfish/proprietary/ssr_diag:system/bin/ssr_diag:qcom \
vendor/qcom/sailfish/proprietary/ssr_setup:system/bin/ssr_setup:qcom \
vendor/qcom/sailfish/proprietary/StoreKeybox:system/bin/StoreKeybox:qcom \
vendor/qcom/sailfish/proprietary/subsystem_ramdump:system/bin/subsystem_ramdump:qcom \
vendor/qcom/sailfish/proprietary/tbaseLoader:system/bin/tbaseLoader:qcom \
vendor/qcom/sailfish/proprietary/test_bet_8996:system/bin/test_bet_8996:qcom \
- vendor/qcom/sailfish/proprietary/test_diag:system/bin/test_diag:qcom \
vendor/qcom/sailfish/proprietary/test_module_pproc:system/bin/test_module_pproc:qcom \
vendor/qcom/sailfish/proprietary/time_daemon:system/bin/time_daemon:qcom \
- vendor/qcom/sailfish/proprietary/wdsdaemon:system/bin/wdsdaemon:qcom \
- vendor/qcom/sailfish/proprietary/WifiLogger_app:system/bin/WifiLogger_app:qcom \
vendor/qcom/sailfish/proprietary/Bluetooth_cal.acdb:system/etc/acdbdata/Bluetooth_cal.acdb:qcom \
vendor/qcom/sailfish/proprietary/General_cal.acdb:system/etc/acdbdata/General_cal.acdb:qcom \
vendor/qcom/sailfish/proprietary/Global_cal.acdb:system/etc/acdbdata/Global_cal.acdb:qcom \
@@ -86,16 +74,6 @@
vendor/qcom/sailfish/proprietary/cpp_firmware_v1_5_2.fw:system/etc/firmware/cpp_firmware_v1_5_2.fw:qcom \
vendor/qcom/sailfish/proprietary/cpp_firmware_v1_6_0.fw:system/etc/firmware/cpp_firmware_v1_6_0.fw:qcom \
vendor/qcom/sailfish/proprietary/cpp_firmware_v1_8_0.fw:system/etc/firmware/cpp_firmware_v1_8_0.fw:qcom \
- vendor/qcom/sailfish/proprietary/nvm_tlv_1.3.bin:system/etc/firmware/nvm_tlv_1.3.bin:qcom \
- vendor/qcom/sailfish/proprietary/nvm_tlv_2.1.bin:system/etc/firmware/nvm_tlv_2.1.bin:qcom \
- vendor/qcom/sailfish/proprietary/nvm_tlv_3.0.bin:system/etc/firmware/nvm_tlv_3.0.bin:qcom \
- vendor/qcom/sailfish/proprietary/nvm_tlv_3.2.bin:system/etc/firmware/nvm_tlv_3.2.bin:qcom \
- vendor/qcom/sailfish/proprietary/nvm_tlv.bin:system/etc/firmware/nvm_tlv.bin:qcom \
- vendor/qcom/sailfish/proprietary/rampatch_tlv_1.3.tlv:system/etc/firmware/rampatch_tlv_1.3.tlv:qcom \
- vendor/qcom/sailfish/proprietary/rampatch_tlv_2.1.tlv:system/etc/firmware/rampatch_tlv_2.1.tlv:qcom \
- vendor/qcom/sailfish/proprietary/rampatch_tlv_3.0.tlv:system/etc/firmware/rampatch_tlv_3.0.tlv:qcom \
- vendor/qcom/sailfish/proprietary/rampatch_tlv_3.2.tlv:system/etc/firmware/rampatch_tlv_3.2.tlv:qcom \
- vendor/qcom/sailfish/proprietary/rampatch_tlv.img:system/etc/firmware/rampatch_tlv.img:qcom \
vendor/qcom/sailfish/proprietary/tfa98xx.cnt:system/etc/firmware/tfa98xx.cnt:qcom \
vendor/qcom/sailfish/proprietary/flp.conf:system/etc/flp.conf:qcom \
vendor/qcom/sailfish/proprietary/izat.conf:system/etc/izat.conf:qcom \
@@ -109,7 +87,6 @@
vendor/qcom/sailfish/proprietary/rcsservice.xml:system/etc/permissions/rcsservice.xml:qcom \
vendor/qcom/sailfish/proprietary/telephonyservice.xml:system/etc/permissions/telephonyservice.xml:qcom \
vendor/qcom/sailfish/proprietary/vzw_sso_permissions.xml:system/etc/permissions/vzw_sso_permissions.xml:qcom \
- vendor/qcom/sailfish/proprietary/qdcm_calib_data_S1_FHD_SAMSUNG_EA8064TG_5.0_command_mode_panel.xml:system/etc/qdcm_calib_data_S1_FHD_SAMSUNG_EA8064TG_5.0_command_mode_panel.xml:qcom \
vendor/qcom/sailfish/proprietary/sap.conf:system/etc/sap.conf:qcom \
vendor/qcom/sailfish/proprietary/com.android.ims.rcsmanager.jar:system/framework/com.android.ims.rcsmanager.jar:qcom \
vendor/qcom/sailfish/proprietary/embmslibrary.jar:system/framework/embmslibrary.jar:qcom \
@@ -132,10 +109,7 @@
vendor/qcom/sailfish/proprietary/libloc_ds_api.so:system/lib/libloc_ds_api.so:qcom \
vendor/qcom/sailfish/proprietary/libloc_eng.so:system/lib/libloc_eng.so:qcom \
vendor/qcom/sailfish/proprietary/libminui.so:system/lib/libminui.so:qcom \
- vendor/qcom/sailfish/proprietary/libmm-qcamera.so:system/lib/libmm-qcamera.so:qcom \
vendor/qcom/sailfish/proprietary/libtinyxml.so:system/lib/libtinyxml.so:qcom \
- vendor/qcom/sailfish/proprietary/bootimg.hmac:system/usr/qfipsverify/bootimg.hmac:qcom \
- vendor/qcom/sailfish/proprietary/qfipsverify.hmac:system/usr/qfipsverify/qfipsverify.hmac:qcom \
vendor/qcom/sailfish/proprietary/lib64/android.hardware.biometrics.fingerprint@2.1.so:system/lib64/android.hardware.biometrics.fingerprint@2.1.so:qcom \
vendor/qcom/sailfish/proprietary/lib64/android.hardware.camera.device@1.0.so:system/lib64/android.hardware.camera.device@1.0.so:qcom \
vendor/qcom/sailfish/proprietary/lib64/android.hardware.camera.device@3.2.so:system/lib64/android.hardware.camera.device@3.2.so:qcom \
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 2ea0f50..f4c2a56 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -80,15 +80,14 @@
# files in /system
/system/bin/mm-pp-dpps u:object_r:mm-pp-daemon_exec:s0
/system/bin/nanoapp_cmd u:object_r:nanoapp_cmd_exec:s0
-/system/bin/mm-qcamera-daemon u:object_r:camera_exec:s0
-/system/bin/ATFWD-daemon u:object_r:atfwd_exec:s0
-/system/bin/smlog_dump u:object_r:smlog_dump_exec:s0
/system/bin/qmuxd u:object_r:qmuxd_exec:s0
/system/bin/location-mq u:object_r:location_exec:s0
-/system/bin/qsee_logger u:object_r:qsee_logger_exec:s0
/system/bin/preloads_copy\.sh u:object_r:preloads_copy_exec:s0
# files in /vendor
+/vendor/bin/mm-qcamera-daemon u:object_r:camera_exec:s0
+/vendor/bin/qsee_logger u:object_r:qsee_logger_exec:s0
+/vendor/bin/smlog_dump u:object_r:smlog_dump_exec:s0
/vendor/bin/irsc_util u:object_r:irsc_util_exec:s0
/vendor/bin/pm-service u:object_r:per_mgr_exec:s0
/vendor/bin/pm-proxy u:object_r:per_proxy_exec:s0
@@ -109,6 +108,7 @@
/vendor/bin/subsystem_ramdump u:object_r:subsystem_ramdump_exec:s0
/vendor/bin/ssr_setup u:object_r:ssr_setup_exec:s0
/vendor/bin/ramdump u:object_r:htc_ramdump_exec:s0
+/vendor/bin/ATFWD-daemon u:object_r:atfwd_exec:s0
# files in /vendor
/vendor/bin/hw/android\.hardware\.drm@1\.0-service.widevine u:object_r:hal_drm_widevine_exec:s0
