From cb9158848a7657edeac9083fc81c279e4a2af4c1 Mon Sep 17 00:00:00 2001 From: jeangraff30 Date: Tue, 24 Nov 2020 22:14:36 -0300 Subject: [PATCH] msm8953-common: Cleanup --- BoardConfigCommon.mk | 5 +- msm8953.mk | 20 +------ rootdir/Android.mk | 8 --- rootdir/etc/init.mmi.overlay.rc | 17 +++--- rootdir/etc/init.mmi.rc | 24 ++------- rootdir/etc/init.qcom.rc | 95 --------------------------------- rootdir/etc/init.target.rc | 32 ----------- 7 files changed, 14 insertions(+), 187 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 04e70f3..232db1b 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -15,8 +15,6 @@ COMMON_PATH := device/motorola/msm8953-common -TARGET_SPECIFIC_HEADER_PATH := $(COMMON_PATH)/include - BOARD_VENDOR := motorola # Architecture @@ -93,7 +91,6 @@ AUDIO_FEATURE_ENABLED_WMA_OFFLOAD := true # Build BUILD_BROKEN_DUP_RULES := true BUILD_BROKEN_USES_BUILD_COPY_HEADERS := true -BUILD_BROKEN_PHONY_TARGETS := true # Bluetooth BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(COMMON_PATH)/bluetooth @@ -170,10 +167,10 @@ TARGET_PROVIDES_LIBLIGHT := true # Partitions BOARD_FLASH_BLOCK_SIZE := 131072 BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456 -BOARD_SYSTEMIMAGE_PARTITION_TYPE := ext4 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_EXFAT_DRIVER := exfat +TARGET_USERIMAGES_USE_EXT4 := true TARGET_USERIMAGES_USE_F2FS := true TARGET_USES_MKE2FS := true TARGET_COPY_OUT_VENDOR := vendor diff --git a/msm8953.mk b/msm8953.mk index ad5ff0f..245a3c6 100644 --- a/msm8953.mk +++ b/msm8953.mk @@ -30,12 +30,6 @@ $(call inherit-product, $(COMMON_PATH)/common_prop.mk) # Soong namespaces PRODUCT_SOONG_NAMESPACES += $(COMMON_PATH) -#ANT+ stack -PRODUCT_PACKAGES += \ - AntHalService \ - libantradio \ - antradio_app - # Audio PRODUCT_PACKAGES += \ android.hardware.audio@6.0-impl \ @@ -78,9 +72,7 @@ PRODUCT_PACKAGES += \ android.hardware.camera.provider@2.4-impl \ camera.device@3.2-impl \ Camera2 \ - libwui \ - vendor.qti.hardware.camera.device@1.0 \ - vendor.qti.hardware.camera.device@1.0_vendor + libwui # Codec2 modules PRODUCT_PACKAGES += \ @@ -192,7 +184,6 @@ PRODUCT_COPY_FILES += \ # Init PRODUCT_PACKAGES += \ init.class_main.sh \ - init.mmi.boot.sh \ init.mmi.usb.sh \ init.qcom.early_boot.sh \ init.qcom.post_boot.sh \ @@ -345,11 +336,6 @@ PRODUCT_PACKAGES += \ PresencePolling \ RcsService -# AOT Preload -PRODUCT_DEXPREOPT_SPEED_APPS += \ - SystemUI \ - NexusLauncherRelease - # Qualcomm PRODUCT_COPY_FILES += \ $(COMMON_PATH)/configs/permissions/privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-qti.xml \ @@ -394,9 +380,7 @@ PRODUCT_COPY_FILES += \ # Sensors PRODUCT_PACKAGES += \ android.hardware.sensors@1.0-impl \ - android.hardware.sensors@1.0-service \ - libsensorndkbridge - + android.hardware.sensors@1.0-service # Shims PRODUCT_PACKAGES += \ libcutils_shim \ diff --git a/rootdir/Android.mk b/rootdir/Android.mk index e20bc1f..0d70c91 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -8,14 +8,6 @@ LOCAL_SRC_FILES := bin/init.class_main.sh LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_EXECUTABLES) include $(BUILD_PREBUILT) -include $(CLEAR_VARS) -LOCAL_MODULE := init.mmi.boot.sh -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := bin/init.mmi.boot.sh -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_EXECUTABLES) -include $(BUILD_PREBUILT) - include $(CLEAR_VARS) LOCAL_MODULE := init.mmi.usb.sh LOCAL_MODULE_TAGS := optional diff --git a/rootdir/etc/init.mmi.overlay.rc b/rootdir/etc/init.mmi.overlay.rc index bf50abc..e91d857 100644 --- a/rootdir/etc/init.mmi.overlay.rc +++ b/rootdir/etc/init.mmi.overlay.rc @@ -19,9 +19,9 @@ on boot chown system system /sys/class/capsense/set_threshold # Change permission for fingerprint sensor - chown system mot_tcmd /sys/devices/soc/soc:fpc_fpc1020/dev_enable - chown system mot_tcmd /sys/devices/soc/soc:fpc_fpc1020/irq - chown system mot_tcmd /sys/devices/soc/soc:fpc_fpc1020/irq_cnt + chown system oem_5004 /sys/devices/soc/soc:fpc_fpc1020/dev_enable + chown system oem_5004 /sys/devices/soc/soc:fpc_fpc1020/irq + chown system oem_5004 /sys/devices/soc/soc:fpc_fpc1020/irq_cnt chmod 0440 /sys/devices/soc/soc:fpc_fpc1020/irq_cnt # Change ownership and permission for laser_sensor @@ -33,11 +33,6 @@ on boot chmod 0660 /sys/kernel/range/near # Change the ownership of display TE files for tcmds - chown root mot_tcmd /sys/class/graphics/fb0/te_test - chown root mot_tcmd /sys/class/graphics/fb0/te_enable - chown root mot_tcmd /sys/class/graphics/fb0/frame_counter - -service mmi-laser-sh /vendor/bin/init.mmi.laser.sh - class core - user root - oneshot \ No newline at end of file + chown root oem_5004 /sys/class/graphics/fb0/te_test + chown root oem_5004 /sys/class/graphics/fb0/te_enable + chown root oem_5004 /sys/class/graphics/fb0/frame_counter diff --git a/rootdir/etc/init.mmi.rc b/rootdir/etc/init.mmi.rc index 6ef0d7c..88cfc4d 100644 --- a/rootdir/etc/init.mmi.rc +++ b/rootdir/etc/init.mmi.rc @@ -7,10 +7,6 @@ import /vendor/etc/init/hw/init.mmi.overlay.rc # Moto USB configuration import /vendor/etc/init/hw/init.mmi.usb.rc -# Carrier specific script -import /vendor/etc/init/carrier/init.${ro.boot.carrier}.rc -import /vendor/etc/init/carrier/init.default.rc - on early-boot write /sys/module/subsystem_restart/parameters/disable_restart_work 0x0 @@ -24,14 +20,6 @@ on init chown system log /proc/driver/mmi_annotate chmod 0640 /proc/driver/mmi_annotate - # Setup kernel dropbox permissions so that dropboxd can utilize it - chown root diag /sys/kernel/dropbox/event - chown root diag /sys/kernel/dropbox/data - -on fs - # use /persist as phony PDS partition - symlink /persist /pds - on post-fs mkdir /mnt/vendor/persist/camera 0755 oem_5004 oem_5004 mkdir /mnt/vendor/persist/camera/dualcal 0777 camera oem_5004 @@ -57,13 +45,12 @@ on post-fs mkdir /mnt/vendor/persist/bt 0755 oem_5004 bluetooth mkdir /persist/public/usc_dm 0775 radio radio mkdir /persist/sds 0700 vold vold - mkdir /mnt/vendor/persist/rfs/msm/mpss/mot_rfs 0771 rfs system + mkdir /mnt/vendor/persist/rfs/msm/mpss/mot_rfs 0771 vendor_rfs system # This dir is used to store any OMA(both DM and CP) files in persist partition # Any app with radio UID or vendor_tcmd GID can read/write/execute files in this dir. mkdir /mnt/vendor/persist/public/oma 0775 radio oem_5004 - chown vendor_prod_persist vendor_prod_persist /mnt/product/persist/lifetime/tf_data chown oem_5004 oem_5004 /mnt/vendor/persist/factory/fti chmod 0664 /mnt/vendor/persist/factory/fti chown oem_5004 oem_5004 /mnt/vendor/persist/factory/byte @@ -86,19 +73,18 @@ on post-fs swapon_all /vendor/etc/fstab.qcom write /proc/sys/vm/page-cluster 0 - on post-fs-data # Setup folders for security mkdir /mnt/vendor/persist/security 02770 drmrpc drmrpc - mkdir /data/vendor/dbvc 0750 vendor_tcmd shell - chown drmrpc vendor_tcmd /mnt/vendor/persist/security + mkdir /data/vendor/dbvc 0750 oem_5004 shell + chown drmrpc oem_5004 /mnt/vendor/persist/security # Setup folder for Pre-Activation Kill Switch app (PAKS) mkdir /mnt/vendor/persist/paks 02770 oem_5004 oem_5004 # Create directory used by power_supply_logger - mkdir /data/vendor/power_supply_logger 0750 vendor_pwric log + mkdir /data/vendor/power_supply_logger 0750 oem_5001 log # Create directory power_supply_logger used by memtest and batt_health mkdir /data/vendor_de/power_supply_logger 0770 root log chown oem_5001 oem_5001 /sys/class/power_supply/battery/cycle_count @@ -228,7 +214,7 @@ on boot chmod 0660 /sys/class/leds/vibrator/seq chown system system /sys/class/leds/vibrator/extra chmod 0660 /sys/class/leds/vibrator/extra - chown root vendor_mod /sys/bus/i2c/devices/2-005a/reduce + chown root oem_5020 /sys/bus/i2c/devices/2-005a/reduce # Change ownership of aov related sysfs entries chown audio audio /sys/kernel/aov/trigger diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 0eebc7a..12d4d20 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -37,10 +37,6 @@ on early-init chown system graphics /sys/kernel/debug/dri/0/debug/recovery_dbgbus chown system graphics /sys/kernel/debug/dri/0/debug/recovery_vbif_dbgbus - # Change ownership of sw_sync node - chown system graphics /sys/kernel/debug/sync/sw_sync - chmod 0666 /sys/kernel/debug/sync/sw_sync - chown root system /dev/kmsg chmod 0620 /dev/kmsg # Load WIGIG platform driver @@ -48,7 +44,6 @@ on early-init on init # Set permissions for persist partition - mkdir /persist 0771 root system mkdir /mnt/vendor/persist 0771 root system # Create cgroup mount point for memory @@ -138,10 +133,6 @@ on boot mkdir /dev/socket/qmux_radio 0770 radio radio chmod 2770 /dev/socket/qmux_radio - mkdir /persist/drm 0770 system system - mkdir /persist/bluetooth 0770 bluetooth bluetooth - mkdir /persist/misc 0770 system system - mkdir /persist/alarm 0770 system system mkdir /mnt/vendor/persist/time 0770 system system mkdir /mnt/vendor/persist/secnvm 0770 system system mkdir /mnt/vendor/persist/iar_db 0770 system system @@ -157,7 +148,6 @@ on boot #Remove SUID bit for iproute2 ip tool chmod 0755 /system/bin/ip - chmod 0444 /sys/devices/platform/msm_hsusb/gadget/usb_state setprop net.tcp.2g_init_rwnd 10 @@ -294,8 +284,6 @@ on post-fs-data # Mounting of persist is moved to 'on emmc-fs' and 'on fs' sections # We chown/chmod /persist again so because mount is run as root + defaults - chown root system /persist - chmod 0771 /persist chown system system /persist/WCNSS_qcom_wlan_nv.bin chmod 0664 /sys/devices/platform/msm_sdcc.1/polling chmod 0664 /sys/devices/platform/msm_sdcc.2/polling @@ -384,12 +372,6 @@ on post-fs-data #Start move time data to /data/vendor once post-fs-data done start vendor.move_time_data -service nqnfcinfo /system/vendor/bin/nqnfcinfo - class late_start - group nfc - user system - oneshot - service iop /system/vendor/bin/iop class main user root @@ -508,11 +490,6 @@ on property:vendor.bluetooth.startbtlogger=false on property:vendor.media.target.version=* setprop vendor.sys.media.target.version ${vendor.media.target.version} -service qcom-c_core-sh /vendor/bin/init.qcom.class_core.sh - class core - user root - oneshot - service qcom-c_main-sh /vendor/bin/init.class_main.sh class main user root @@ -526,12 +503,6 @@ on property:vold.decrypt=trigger_restart_framework on property:persist.env.fastdorm.enabled=true setprop persist.radio.data_no_toggle 1 -service vendor.qrtr-ns /vendor/bin/qrtr-ns -f - class core - user vendor_qrtr - group vendor_qrtr - capabilities NET_BIND_SERVICE - service irsc_util /vendor/bin/irsc_util "/vendor/etc/sec_config" class core user root @@ -574,12 +545,6 @@ service qmiproxy /system/bin/qmiproxy group radio diag disabled -service vendor.sensors /vendor/bin/sscrpcd sensorspd - class early_hal - user system - group system wakelock - capabilities BLOCK_SUSPEND - service vendor.sensors.qti /vendor/bin/sensors.qti class core user system @@ -675,19 +640,6 @@ service iprenew_wigig0 /system/bin/dhcpcd -n disabled oneshot -service ptt_socket_app /system/vendor/bin/ptt_socket_app -d - class main - user wifi - group wifi system inet net_admin - capabilities NET_ADMIN - oneshot - -service ptt_ffbm /system/vendor/bin/ptt_socket_app -f -d - user root - group root - disabled - oneshot - service wifi_ftmd /system/vendor/bin/wifi_ftmd user system group system inet net_admin @@ -718,18 +670,6 @@ service iprenew_bt-pan /system/bin/dhcpcd -n disabled oneshot -service ssgqmigd /vendor/bin/ssgqmigd - class late_start - user radio - group radio gps system - socket ssgqmig seqpacket 0660 radio inet - -service mlid /vendor/bin/mlid - class late_start - user gps - group gps - socket mlid stream 0666 gps gps - service loc_launcher /system/vendor/bin/loc_launcher class late_start user gps @@ -758,11 +698,6 @@ service vendor-sensor-sh /vendor/bin/init.qcom.sensors.sh user root oneshot -service crashdata-sh /vendor/bin/init.qcom.crashdata.sh - class late_start - user root - oneshot - service qcom-post-boot /vendor/bin/init.qcom.post_boot.sh class late_start user root @@ -788,11 +723,6 @@ on property:sys.boot_completed=1 on property:ro.vendor.ril.mbn_copy_completed=1 write /data/vendor/radio/copy_complete 1 -service qvop-daemon /vendor/bin/qvop-daemon - class late_start - user system - group system drmrpc - service vendor.atfwd /vendor/bin/ATFWD-daemon class late_start user system @@ -874,16 +804,6 @@ service vendor.msm_irqbl_sdm630 /vendor/bin/msm_irqbalance -f /system/vendor/etc group root disabled -service qseeproxydaemon /system/vendor/bin/qseeproxydaemon - class late_start - user system - group system - -service esepmdaemon /system/vendor/bin/esepmdaemon - class core - user system - group nfc - on charger setprop persist.sys.usb.config mass_storage start qcom-post-boot @@ -923,11 +843,6 @@ on property:vendor.rild.libpath=* on property:ro.vendor.radio.noril=* setprop ro.radio.noril ${ro.vendor.radio.noril} -service seemp_healthd /vendor/bin/seemp_healthd - class late_start - user system - group system - service vendor.power_off_alarm /vendor/bin/power_off_alarm class core group system @@ -948,16 +863,6 @@ service vendor.hbtp /vendor/bin/hbtp_daemon capabilities SYS_NICE disabled -service chre /vendor/bin/chre - class late_start - user system - group system - socket chre seqpacket 0660 root system - shutdown critical - -on property:vendor.chre.enabled=0 - stop chre - service bugreport /system/bin/dumpstate -d -p -B -z -o /data/user_de/0/com.android.shell/files/bugreports/bugreport class main disabled diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc index 19ee558..ef96b93 100644 --- a/rootdir/etc/init.target.rc +++ b/rootdir/etc/init.target.rc @@ -33,7 +33,6 @@ import /vendor/etc/init/hw/init.${ro.boot.device}.rc on early-init exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules audio_apr audio_adsp_loader audio_q6_notifier audio_q6 audio_usf audio_native audio_pinctrl_wcd audio_swr audio_platform audio_swr_ctrl audio_hdmi audio_wcd9xxx audio_wcd_core audio_wsa881x_analog audio_wsa881x audio_mbhc audio_stub audio_digital_cdc audio_analog_cdc audio_wcd_cpe audio_cpe_lsm audio_wcd9335 audio_machine_sdm450 audio_machine_ext_sdm450 write /proc/sys/kernel/sched_boost 1 - mkdir /firmware 0771 system system symlink /data/tombstones /tombstones on init @@ -248,37 +247,6 @@ on charger && property:ro.boot.usbconfigfs=true on charger && property:ro.boot.usbconfigfs=false setprop sys.usb.configfs 0 -## imsdatadaemon starts with root and UID will be downgraded to SYSTEM. -service vendor.imsqmidaemon /system/vendor/bin/imsqmidaemon - class main - user radio - socket ims_qmid stream 0660 system radio - group radio log diag - -# imsdatadaemon starts with root and UID will be downgraded to SYSTEM. -service vendor.imsdatadaemon /system/vendor/bin/imsdatadaemon - class main - user radio - socket ims_datad stream 0660 system radio - group radio wifi inet log diag - disabled - -on property:vendor.ims.QMI_DAEMON_STATUS=1 - start vendor.imsdatadaemon - -service vendor.ims_rtp_daemon /vendor/bin/ims_rtp_daemon - class main - user radio - group radio vendor_qti_diag inet log - -service vendor.imsrcsservice /system/vendor/bin/imsrcsd - class main - user system - group radio diag inet log wakelock - -on property:vendor.ims.DATA_DAEMON_STATUS=1 - restart vendor.ims_rtp_daemon - service adsprpcd /system/vendor/bin/adsprpcd class main user media