diff options
| -rw-r--r-- | BoardConfigCommon.mk | 2 | ||||
| -rw-r--r-- | config.fs | 6 | ||||
| -rwxr-xr-x | extract-files.sh | 3 | ||||
| -rw-r--r-- | proprietary-files.txt | 2 | ||||
| -rw-r--r-- | rootdir/etc/fstab.qcom | 1 | ||||
| -rw-r--r-- | rootdir/etc/init.camera.rc | 20 |
6 files changed, 2 insertions, 32 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 6b3bbdf..5254f30 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -68,7 +68,7 @@ TARGET_INIT_VENDOR_LIB := libinit_shinano # Partition information BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2671771648 BOARD_USERDATAIMAGE_PARTITION_SIZE := 12656294912 -BOARD_ROOT_EXTRA_FOLDERS := idd lta-label +BOARD_ROOT_EXTRA_FOLDERS := lta-label # Recovery TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab.qcom @@ -1,9 +1,3 @@ -[idd/] -mode: 0751 -user: AID_SYSTEM -group: AID_SYSTEM -caps: 0 - [lta-label/] mode: 0555 user: AID_SYSTEM diff --git a/extract-files.sh b/extract-files.sh index 5732fa2..398fccb 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -26,9 +26,6 @@ function blob_fixup() { vendor/lib/libdsi_netctrl.so) sed -i "s|/system/etc/data/dsi_config.xml|/vendor/etc/data/dsi_config.xml|g" "${2}" ;; - vendor/bin/iddd) - sed -i "s|/system/etc/iddd.conf|/vendor/etc/iddd.conf|g" "${2}" - ;; vendor/bin/netmgrd) sed -i "s|/system/etc/data/netmgr_config.xml|/vendor/etc/data/netmgr_config.xml|g" "${2}" ;; diff --git a/proprietary-files.txt b/proprietary-files.txt index fbe87d2..c129e40 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -240,8 +240,6 @@ vendor/lib/librpmb.so vendor/lib/libssd.so # In Device Diagnostics (idd) -bin/iddd:vendor/bin/iddd -etc/iddd.conf:vendor/etc/iddd.conf lib/libidd.so:vendor/lib/libidd.so # Keymaster firmware diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom index 7ed54e1..e8602de 100644 --- a/rootdir/etc/fstab.qcom +++ b/rootdir/etc/fstab.qcom @@ -11,7 +11,6 @@ /dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,rw,inline_xattr wait,check,formattable,encryptable=footer,length=-16384 /dev/block/bootdevice/by-name/userdata /data ext4 noatime,nosuid,nodev,barrier=1,noauto_da_alloc wait,check,encryptable=footer,length=-16384 /dev/block/bootdevice/by-name/apps_log /misc emmc defaults defaults -tmpfs /idd tmpfs size=8M,nosuid,nodev,noatime,noexec defaults /devices/msm_sdcc.2/mmc_host* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata /devices/platform/xhci-hcd/usb* auto auto nosuid,nodev voldmanaged=usb:auto /dev/block/zram0 none swap defaults zramsize=536870912,max_comp_streams=4,notrim diff --git a/rootdir/etc/init.camera.rc b/rootdir/etc/init.camera.rc index eec2b78..a541bd7 100644 --- a/rootdir/etc/init.camera.rc +++ b/rootdir/etc/init.camera.rc @@ -14,18 +14,11 @@ # limitations under the License. # -on init - on early-fs wait /dev/block/mmcblk0p1 class_start trimarea exec u:r:qti_init_shell:s0 -- /sbin/wait4tad_static -on fs - exec u:r:qti_init_shell:s0 -- /system/bin/rm -r /idd/lost+found - symlink /idd /mnt/idd - restorecon_recursive /idd - on early-boot #SONY early boot start ta_qmi_service @@ -77,12 +70,6 @@ on post-fs-data setprop init.taimport.ready true # taimport ready, use this as trigger for multi-cdf-symlinker - # SONY: IDD - mkdir /idd/lost+found 0770 root root - mkdir /idd/output 0755 system system - mkdir /idd/socket 0711 system system - restorecon_recursive /idd - service taimport /vendor/bin/taimport class late_start user root @@ -99,7 +86,7 @@ service initcredmgr /vendor/bin/credmgrfirstboot.sh # When credmgrfirstboot is ready it set sys.credmgrdready=true. # Start credmgrd after that on property:sys.credmgrdready=true -start credmgrd + start credmgrd # Start Credential manager daemon service credmgrd /vendor/bin/credmgrd @@ -150,8 +137,3 @@ service updatemiscta /vendor/bin/updatemiscta user system group system oneshot - -service iddd /vendor/bin/iddd - class main - user system - group system log inet cameraserver media |