From c5e1598aaa7d8b253af22e687ff294ee5044fa2e Mon Sep 17 00:00:00 2001 From: roynatech2544 Date: Thu, 2 Dec 2021 20:47:22 +0900 Subject: [PATCH] treewide: decommonize sensor service --- a10/device.mk | 2 +- a20/device.mk | 5 +- a20e/device.mk | 5 +- a30/device.mk | 5 +- a40/device.mk | 5 +- universal7885-common/rootdir/Android.mk | 13 +- .../rootdir/etc/ueventd.exynos7884B.rc | 215 ------------------ .../etc/{ueventd.exynos7904.rc => ueventd.rc} | 44 ++-- universal7885-common/universal7885-common.mk | 2 - universal7885-common/usb/typeb/Android.bp | 2 - 10 files changed, 39 insertions(+), 259 deletions(-) delete mode 100644 universal7885-common/rootdir/etc/ueventd.exynos7884B.rc rename universal7885-common/rootdir/etc/{ueventd.exynos7904.rc => ueventd.rc} (93%) diff --git a/a10/device.mk b/a10/device.mk index fc553da..3e2e356 100644 --- a/a10/device.mk +++ b/a10/device.mk @@ -19,4 +19,4 @@ TARGET_SCREEN_WIDTH := 720 PRODUCT_PACKAGES += \ fstab.exynos7884B \ - ueventd.exynos7884B.rc + ueventd.exynos7885.rc diff --git a/a20/device.mk b/a20/device.mk index 68e3efb..f006f35 100644 --- a/a20/device.mk +++ b/a20/device.mk @@ -28,4 +28,7 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ fstab.exynos7884B \ - ueventd.exynos7884B.rc + ueventd.exynos7885.rc + +PRODUCT_PACKAGES += \ + android.hardware.sensors@1.0-service diff --git a/a20e/device.mk b/a20e/device.mk index cdebb60..f2b92ea 100644 --- a/a20e/device.mk +++ b/a20e/device.mk @@ -28,4 +28,7 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ fstab.exynos7884B \ - ueventd.exynos7884B.rc + ueventd.exynos7885.rc + +PRODUCT_PACKAGES += \ + android.hardware.sensors@1.0-service diff --git a/a30/device.mk b/a30/device.mk index 7fb293e..5670fb2 100644 --- a/a30/device.mk +++ b/a30/device.mk @@ -22,4 +22,7 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ fstab.exynos7904 \ - ueventd.exynos7904.rc + ueventd.exynos7885.rc + +PRODUCT_PACKAGES += \ + android.hardware.sensors@1.0-service diff --git a/a40/device.mk b/a40/device.mk index 5e88a9f..7b3c595 100644 --- a/a40/device.mk +++ b/a40/device.mk @@ -22,4 +22,7 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ fstab.exynos7904 \ - ueventd.exynos7904.rc + ueventd.exynos7885.rc + +PRODUCT_PACKAGES += \ + android.hardware.sensors@1.0-service diff --git a/universal7885-common/rootdir/Android.mk b/universal7885-common/rootdir/Android.mk index 17e0fd5..5f035eb 100644 --- a/universal7885-common/rootdir/Android.mk +++ b/universal7885-common/rootdir/Android.mk @@ -25,20 +25,11 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init include $(BUILD_PREBUILT) include $(CLEAR_VARS) -LOCAL_MODULE := ueventd.exynos7884B.rc +LOCAL_MODULE := ueventd.exynos7885.rc LOCAL_MODULE_STEM := ueventd.rc LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/$(LOCAL_MODULE) -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR) -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := ueventd.exynos7904.rc -LOCAL_MODULE_STEM := ueventd.rc -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/$(LOCAL_MODULE) +LOCAL_SRC_FILES := etc/$(LOCAL_MODULE_STEM) LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR) include $(BUILD_PREBUILT) diff --git a/universal7885-common/rootdir/etc/ueventd.exynos7884B.rc b/universal7885-common/rootdir/etc/ueventd.exynos7884B.rc deleted file mode 100644 index f954f1c..0000000 --- a/universal7885-common/rootdir/etc/ueventd.exynos7884B.rc +++ /dev/null @@ -1,215 +0,0 @@ -/dev/mali0 0666 system system -/dev/ion 0666 system system -/dev/ump 0666 system graphics -/dev/exynos-mem 0660 system graphics -/dev/video0 0660 system camera -/dev/video1 0660 system camera -/dev/video2 0660 system camera -/dev/video3 0660 system camera -/dev/video20 0660 system system -# media0 is used for GSC, DECON, etc -/dev/media0 0660 system camera -# media1 is used for DECON Ext WB -/dev/media1 0660 system graphics -# Various devices use the v4l-subdev interface -# We declare all such nodes simultaneously here -/dev/v4l-subdev0 0660 system camera -/dev/v4l-subdev1 0660 system camera -/dev/v4l-subdev2 0660 system camera -/dev/v4l-subdev3 0660 system camera -/dev/v4l-subdev4 0660 system camera -/dev/v4l-subdev5 0660 system camera -/dev/v4l-subdev6 0660 system camera -/dev/v4l-subdev7 0660 system camera -/dev/v4l-subdev8 0660 system camera -/dev/v4l-subdev9 0660 system camera -/dev/v4l-subdev10 0660 system camera -/dev/v4l-subdev11 0660 system camera -/dev/v4l-subdev12 0660 system camera -/dev/v4l-subdev13 0660 system camera -/dev/v4l-subdev14 0660 system camera -/dev/v4l-subdev15 0660 system camera -/dev/v4l-subdev16 0660 system camera -/dev/v4l-subdev17 0660 system camera -/dev/v4l-subdev18 0660 system camera -/dev/v4l-subdev19 0660 system camera -# v4l-subdev20 is used for DECON Ext WB -/dev/v4l-subdev20 0660 system graphics -/dev/v4l-subdev21 0660 system graphics -/dev/v4l-subdev32 0660 system graphics - -# gscalers -/dev/video23 0660 media graphics -/dev/video26 0660 media graphics -/dev/video24 0660 media graphics -/dev/video27 0660 media graphics -/dev/video29 0660 media graphics -/dev/video30 0660 media graphics -# video31 is used for DECON Ext WB -/dev/video31 0660 media graphics - -# mscalers -/dev/video50 0660 mediacodec drmrpc -/dev/m2m1shot_scaler0 0660 mediacodec drmrpc - -/dev/video55 0666 system graphics -/dev/g2d 0660 system graphics -/dev/fimg2d 0666 system graphics -/dev/i2c-2 0660 system system -/dev/HPD 0660 system system - -# mfc -/dev/video6 0660 mediacodec mediadrm -/dev/video7 0660 mediacodec mediadrm -/dev/video8 0660 mediacodec mediadrm -/dev/video9 0660 mediacodec mediadrm -/dev/video10 0660 mediacodec mediadrm -/dev/video11 0660 mediacodec mediadrm - -# camera -/dev/video101 0660 cameraserver camera -/dev/video102 0660 cameraserver camera -/dev/video103 0660 cameraserver camera -/dev/video104 0660 cameraserver camera -/dev/video107 0660 cameraserver camera -/dev/video109 0660 cameraserver camera -/dev/video110 0660 cameraserver camera -/dev/video111 0660 cameraserver camera -/dev/video112 0660 cameraserver camera -/dev/video120 0660 cameraserver camera -/dev/video121 0660 cameraserver camera -/dev/video122 0660 cameraserver camera -/dev/video130 0660 cameraserver camera -/dev/video131 0660 cameraserver camera -/dev/video132 0660 cameraserver camera -/dev/video140 0660 cameraserver camera -/dev/video141 0660 cameraserver camera -/dev/video142 0660 cameraserver camera -/dev/video150 0660 cameraserver camera -/dev/video151 0660 cameraserver camera -/dev/video152 0660 cameraserver camera -/dev/video153 0660 cameraserver camera -/dev/video154 0660 cameraserver camera -/dev/video155 0660 cameraserver camera -/dev/video160 0660 cameraserver camera -/dev/video161 0660 cameraserver camera -/dev/video170 0660 cameraserver camera -/dev/video171 0660 cameraserver camera -/dev/video172 0660 cameraserver camera -/dev/video173 0660 cameraserver camera -/dev/video174 0660 cameraserver camera -/dev/video175 0660 cameraserver camera -/dev/video180 0660 cameraserver camera -/dev/video190 0660 cameraserver camera -/dev/video191 0660 cameraserver camera -/dev/video192 0660 cameraserver camera -/dev/video193 0660 cameraserver camera -/dev/video210 0660 cameraserver camera -/dev/video211 0660 cameraserver camera -/dev/video212 0660 cameraserver camera -/dev/video213 0660 cameraserver camera -/dev/video214 0660 cameraserver camera -/dev/video215 0660 cameraserver camera -/dev/video216 0660 cameraserver camera -/dev/video217 0660 cameraserver camera -/dev/video218 0660 cameraserver camera -/dev/video219 0660 cameraserver camera -/dev/video220 0660 cameraserver camera -/dev/video221 0660 cameraserver camera -/dev/video222 0660 cameraserver camera -/dev/video223 0660 cameraserver camera -/dev/video224 0660 cameraserver camera -/dev/video225 0660 cameraserver camera -/dev/media2 0660 media media -/dev/hdcp2 0660 media media - -# jpeg -/dev/m2m1shot_jpeg 0660 media media -/dev/video12 0660 cameraserver media - -# audio -/dev/seiren 0660 system audio - -# Mobicore -/dev/mobicore 0600 system system -/dev/mobicore-user 0666 radio system - -# Secure MEM driver -/dev/s5p-smem 0660 system system - -# TEEGRIS -/dev/tzdev 0666 system system -/dev/tziwsock 0666 system system -/dev/ionfd2phys 0660 system system -/dev/tzirs 0660 system system -/dev/tuihw 0660 system system - -# Secure MEM driver -/dev/s5p-smem 0660 system system - -# DM tools -/dev/ttyGS0 0660 system system -/dev/ttyGS1 0660 system system - -# Modem Interface -/dev/block/platform/13500000.dwmmc0/by-name/radio 0660 system radio -/dev/block/platform/13500000.dwmmc0/by-name/cp_debug 0660 radio system -/dev/umts* 0660 system radio -/dev/ipc* 0660 system radio -/dev/umts_csd 0660 system loop_radio -/dev/smd4 0660 system radio -/dev/ramdump_memshare 0660 system radio -/dev/umts_ciq* 0660 system bridge_rw - -# dev ril bridge -/dev/drb 0660 system radio - -# interactive governor parameters -/sys/devices/system/cpu/cpu* cpufreq/interactive/timer_rate 0660 system system -/sys/devices/system/cpu/cpu* cpufreq/interactive/timer_slack 0660 system system -/sys/devices/system/cpu/cpu* cpufreq/interactive/min_sample_time 0660 system system -/sys/devices/system/cpu/cpu* cpufreq/interactive/hispeed_freq 0660 system system -/sys/devices/system/cpu/cpu* cpufreq/interactive/target_loads 0660 system system -/sys/devices/system/cpu/cpu* cpufreq/interactive/go_hispeed_load 0660 system system -/sys/devices/system/cpu/cpu* cpufreq/interactive/above_hispeed_delay 0660 system system -/sys/devices/system/cpu/cpu* cpufreq/interactive/boost 0660 system system -/sys/devices/system/cpu/cpu* cpufreq/interactive/boostpulse 0660 system system -/sys/devices/system/cpu/cpu* cpufreq/interactive/input_boost 0660 system system -/sys/devices/system/cpu/cpu* cpufreq/interactive/boostpulse_duration 0660 system system -/sys/devices/system/cpu/cpu* cpufreq/interactive/io_is_busy 0660 system system - -# Vision (VPU, SCORE) -/dev/vertex0 0660 media media -/dev/vertex1 0660 media media - -#SCSC Bluetooth -/dev/scsc_h4_0 0660 bluetooth bluetooth - -#SCSC ANT -/dev/scsc_ant_0 0660 system system - -#SCSC WLAN -/dev/mx_0_r4_gdb 0660 wifi wifi -/dev/mx_0_m4_gdb 0660 wifi wifi -/dev/mx_0_mmap 0660 wifi wifi -/dev/mx_client_test_0 0660 wifi wifi -/dev/mx_0_debug_sampler 0660 wifi wifi -/dev/mx140_usb_clk_test_0 0660 wifi wifi -/dev/scsc_log_collector_0 0660 wifi wifi - -# Google FRP solution -/dev/block/platform/13500000.dwmmc0/by-name/PERSISTENT 0660 system system - -# Reactivation Lock solution -/dev/block/platform/13500000.dwmmc0/by-name/STEADY 0660 system system - -# Google FRP solution -/dev/block/platform/13500000.dwmmc0/by-name/persistent 0660 system system - -# Reactivation Lock solution -/dev/block/platform/13500000.dwmmc0/by-name/steady 0660 system system - -# Sensor -/dev/input/event* 0660 system input -/sys/devices/virtual/input/input* enable 0660 system input -/sys/devices/virtual/input/input* poll_delay 0660 system input diff --git a/universal7885-common/rootdir/etc/ueventd.exynos7904.rc b/universal7885-common/rootdir/etc/ueventd.rc similarity index 93% rename from universal7885-common/rootdir/etc/ueventd.exynos7904.rc rename to universal7885-common/rootdir/etc/ueventd.rc index 84eae04..cf4b853 100644 --- a/universal7885-common/rootdir/etc/ueventd.exynos7904.rc +++ b/universal7885-common/rootdir/etc/ueventd.rc @@ -47,17 +47,14 @@ /dev/video30 0660 media graphics # video31 is used for DECON Ext WB /dev/video31 0660 media graphics - # mscalers /dev/video50 0660 mediacodec drmrpc /dev/m2m1shot_scaler0 0660 mediacodec drmrpc - /dev/video55 0666 system graphics /dev/g2d 0660 system graphics /dev/fimg2d 0666 system graphics /dev/i2c-2 0660 system system /dev/HPD 0660 system system - # mfc /dev/video6 0660 mediacodec mediadrm /dev/video7 0660 mediacodec mediadrm @@ -65,7 +62,6 @@ /dev/video9 0660 mediacodec mediadrm /dev/video10 0660 mediacodec mediadrm /dev/video11 0660 mediacodec mediadrm - # camera /dev/video101 0660 cameraserver camera /dev/video102 0660 cameraserver camera @@ -122,15 +118,12 @@ /dev/video225 0660 cameraserver camera /dev/media2 0660 media media /dev/hdcp2 0660 media media - # jpeg /dev/m2m1shot_jpeg 0660 media media /dev/video12 0660 cameraserver media - # audio /dev/seiren 0660 system audio - -#Mobicore +# Mobicore /dev/mobicore 0700 system system /dev/mobicore-user 0666 radio system @@ -177,13 +170,13 @@ /dev/vertex0 0660 media media /dev/vertex1 0660 media media -#SCSC Bluetooth +# SCSC Bluetooth /dev/scsc_h4_0 0660 bluetooth bluetooth -#SCSC ANT +# SCSC ANT /dev/scsc_ant_0 0660 system system -#SCSC WLAN +# SCSC WLAN /dev/mx_0_r4_gdb 0660 wifi wifi /dev/mx_0_m4_gdb 0660 wifi wifi /dev/mx_0_mmap 0660 wifi wifi @@ -192,30 +185,21 @@ /dev/mx140_usb_clk_test_0 0660 wifi wifi /dev/scsc_log_collector_0 0660 wifi wifi -# Google FRP solution +# Google FRP solution # Reactivation Lock solution /dev/block/platform/13500000.dwmmc0/by-name/PERSISTENT 0660 system system - -# Reactivation Lock solution /dev/block/platform/13500000.dwmmc0/by-name/STEADY 0660 system system - -# Google FRP solution /dev/block/platform/13500000.dwmmc0/by-name/persistent 0660 system system - -# Reactivation Lock solution /dev/block/platform/13500000.dwmmc0/by-name/steady 0660 system system -# sensorhub +# Sensorhub /dev/ssp_sensorhub 0660 system system /dev/ssp_data_injection 0660 system system - -# Sensorhub IIO -/dev/ssp_sensorhub 0660 system system /dev/iio:device* 0660 system system /sys/devices/platform/13980000.spi/spi_master/spi4/spi4.0/iio:device* buffer/enable 0660 system system /sys/devices/platform/13980000.spi/spi_master/spi4/spi4.0/iio:device* buffer/length 0660 system system /sys/bus/iio/devices/iio:device* 0664 system radio -# TEEGRIS +# TEE /dev/tzdev 0666 system system /dev/tziwsock 0666 system system /dev/ionfd2phys 0660 system system @@ -225,7 +209,19 @@ /dev/tz_shmem_validator 0666 system system /dev/tz_wormhole 0666 system system -# Sensor +# Input /dev/input/event* 0660 system input /sys/devices/virtual/input/input* enable 0660 system input /sys/devices/virtual/input/input* poll_delay 0660 system input +/dev/mobicore 0600 system system +/dev/tziwsock 0666 system system +/dev/ionfd2phys 0660 system system +/dev/umts* 0660 system radio +/dev/ipc* 0660 system radio +/dev/umts_csd 0660 system loop_radio +/dev/smd4 0660 system radio +/dev/ramdump_memshare 0660 system radio + +# dev ril bridge +/dev/drb 0660 system radio +/sys/devices/system/cpu/cpu* cpufreq/interactive/boostpulse 0660 system system diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk index b10c46f..1dd18fd 100644 --- a/universal7885-common/universal7885-common.mk +++ b/universal7885-common/universal7885-common.mk @@ -248,11 +248,9 @@ PRODUCT_AAPT_PREF_CONFIG := xxhdpi PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/seccomp/mediacodec.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy - # Sensors PRODUCT_PACKAGES += \ android.hardware.sensors@1.0-impl.samsung \ - android.hardware.sensors@1.0-service \ libsensorndkbridge # Shims diff --git a/universal7885-common/usb/typeb/Android.bp b/universal7885-common/usb/typeb/Android.bp index 0bac85d..e13bab8 100644 --- a/universal7885-common/usb/typeb/Android.bp +++ b/universal7885-common/usb/typeb/Android.bp @@ -20,9 +20,7 @@ cc_binary { shared_libs: [ "libcutils", "libhidlbase", - "libhidltransport", "liblog", - "libhwbinder", "libutils", "libhardware", "android.hardware.usb@1.0",