From 42fff278ba99e8630b4f3cc96801ca2b8fa18af0 Mon Sep 17 00:00:00 2001 From: SamarV-121 Date: Wed, 23 Jun 2021 10:04:26 +0530 Subject: [PATCH] universal7885: Drop all prebuilt vendor hax * also Compile all HALs to vendor * Remove stuffs actually from vendor which we were disabling in system Change-Id: I15f5a12a2c36238adf99ca9bbbd0c97475b72fc6 Signed-off-by: SamarV-121 --- BoardConfigCommon.mk | 4 - configs/vndkcore.libraries.29.txt | 222 ------------------ configs/vndkprivate.libraries.29.txt | 5 - framework_manifest.xml | 20 -- manifest.xml | 78 ++---- power/Android.bp | 1 + ...ardware.power@1.0-service.universal7904.rc | 2 +- product.prop | 3 - proprietary-files.txt | 35 --- rootdir/Android.mk | 10 +- rootdir/etc/init.exynos7904.rc | 92 ++------ rootdir/etc/init.universal7904.rc | 87 ------- sensors/Android.mk | 72 ------ sepolicy/private/app.te | 1 - sepolicy/private/bootanim.te | 1 - sepolicy/private/fastbootd.te | 5 - sepolicy/private/file.te | 3 - sepolicy/private/file_contexts | 11 - sepolicy/private/genfs_contexts | 6 - sepolicy/private/hal_audio.te | 2 - sepolicy/private/hal_fastcharge_samsung.te | 10 - sepolicy/private/hal_health.te | 1 - sepolicy/private/hal_power.te | 7 - sepolicy/private/hal_touch_samsung.te | 8 - sepolicy/private/healthd.te | 1 - sepolicy/private/init.te | 2 - sepolicy/private/property.te | 1 - sepolicy/private/property_contexts | 1 - sepolicy/private/sec_system_init_shell.te | 3 - sepolicy/private/system_server.te | 3 - sepolicy/private/zygote.te | 1 - universal7904-common.mk | 18 +- 32 files changed, 48 insertions(+), 668 deletions(-) delete mode 100644 configs/vndkcore.libraries.29.txt delete mode 100644 configs/vndkprivate.libraries.29.txt delete mode 100644 framework_manifest.xml delete mode 100644 rootdir/etc/init.universal7904.rc delete mode 100644 sensors/Android.mk delete mode 100644 sepolicy/private/app.te delete mode 100644 sepolicy/private/bootanim.te delete mode 100644 sepolicy/private/fastbootd.te delete mode 100644 sepolicy/private/file.te delete mode 100644 sepolicy/private/file_contexts delete mode 100644 sepolicy/private/genfs_contexts delete mode 100644 sepolicy/private/hal_audio.te delete mode 100644 sepolicy/private/hal_fastcharge_samsung.te delete mode 100644 sepolicy/private/hal_health.te delete mode 100644 sepolicy/private/hal_power.te delete mode 100644 sepolicy/private/hal_touch_samsung.te delete mode 100644 sepolicy/private/healthd.te delete mode 100644 sepolicy/private/init.te delete mode 100644 sepolicy/private/property.te delete mode 100644 sepolicy/private/property_contexts delete mode 100644 sepolicy/private/sec_system_init_shell.te delete mode 100644 sepolicy/private/system_server.te delete mode 100644 sepolicy/private/zygote.te diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 0211f3d..3adaf1b 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -51,7 +51,6 @@ TARGET_KERNEL_SOURCE := kernel/samsung/universal7904 TARGET_KERNEL_CLANG_COMPILE := true # HIDL -DEVICE_FRAMEWORK_MANIFEST_FILE := $(COMMON_PATH)/framework_manifest.xml DEVICE_MANIFEST_FILE := $(COMMON_PATH)/manifest.xml DEVICE_MATRIX_FILE := $(COMMON_PATH)/compatibility_matrix.xml @@ -74,9 +73,6 @@ TARGET_VENDOR_PROP += $(COMMON_PATH)/vendor.prop # Recovery BOARD_HAS_DOWNLOAD_MODE := true -# SELinux -BOARD_PLAT_PRIVATE_SEPOLICY_DIR += $(COMMON_PATH)/sepolicy/private - # Vendor TARGET_COPY_OUT_VENDOR := vendor diff --git a/configs/vndkcore.libraries.29.txt b/configs/vndkcore.libraries.29.txt deleted file mode 100644 index 66357f2..0000000 --- a/configs/vndkcore.libraries.29.txt +++ /dev/null @@ -1,222 +0,0 @@ -android.frameworks.cameraservice.common@2.0.so -android.frameworks.cameraservice.device@2.0.so -android.frameworks.cameraservice.service@2.0.so -android.frameworks.displayservice@1.0.so -android.frameworks.schedulerservice@1.0.so -android.frameworks.sensorservice@1.0.so -android.frameworks.stats@1.0.so -android.frameworks.vr.composer@1.0.so -android.hardware.atrace@1.0.so -android.hardware.audio.common@2.0.so -android.hardware.audio.common@4.0.so -android.hardware.audio.common@5.0.so -android.hardware.audio.effect@2.0.so -android.hardware.audio.effect@4.0.so -android.hardware.audio.effect@5.0.so -android.hardware.audio@2.0.so -android.hardware.audio@4.0.so -android.hardware.audio@5.0.so -android.hardware.authsecret@1.0.so -android.hardware.automotive.audiocontrol@1.0.so -android.hardware.automotive.evs@1.0.so -android.hardware.automotive.vehicle@2.0.so -android.hardware.biometrics.face@1.0.so -android.hardware.biometrics.fingerprint@2.1.so -android.hardware.bluetooth.a2dp@1.0.so -android.hardware.bluetooth.audio@2.0.so -android.hardware.bluetooth@1.0.so -android.hardware.boot@1.0.so -android.hardware.broadcastradio@1.0.so -android.hardware.broadcastradio@1.1.so -android.hardware.broadcastradio@2.0.so -android.hardware.camera.common@1.0.so -android.hardware.camera.device@1.0.so -android.hardware.camera.device@3.2.so -android.hardware.camera.device@3.3.so -android.hardware.camera.device@3.4.so -android.hardware.camera.device@3.5.so -android.hardware.camera.metadata@3.2.so -android.hardware.camera.metadata@3.3.so -android.hardware.camera.metadata@3.4.so -android.hardware.camera.provider@2.4.so -android.hardware.camera.provider@2.5.so -android.hardware.cas.native@1.0.so -android.hardware.cas@1.0.so -android.hardware.cas@1.1.so -android.hardware.configstore-utils.so -android.hardware.configstore@1.0.so -android.hardware.configstore@1.1.so -android.hardware.confirmationui-support-lib.so -android.hardware.confirmationui@1.0.so -android.hardware.contexthub@1.0.so -android.hardware.drm@1.0.so -android.hardware.drm@1.1.so -android.hardware.drm@1.2.so -android.hardware.dumpstate@1.0.so -android.hardware.fastboot@1.0.so -android.hardware.gatekeeper@1.0.so -android.hardware.gnss.measurement_corrections@1.0.so -android.hardware.gnss.visibility_control@1.0.so -android.hardware.gnss@1.0.so -android.hardware.gnss@1.1.so -android.hardware.gnss@2.0.so -android.hardware.graphics.allocator@2.0.so -android.hardware.graphics.allocator@3.0.so -android.hardware.graphics.bufferqueue@1.0.so -android.hardware.graphics.bufferqueue@2.0.so -android.hardware.graphics.composer@2.1.so -android.hardware.graphics.composer@2.2.so -android.hardware.graphics.composer@2.3.so -android.hardware.health.storage@1.0.so -android.hardware.health@1.0.so -android.hardware.health@2.0.so -android.hardware.input.classifier@1.0.so -android.hardware.input.common@1.0.so -android.hardware.ir@1.0.so -android.hardware.keymaster@3.0.so -android.hardware.keymaster@4.0.so -android.hardware.light@2.0.so -android.hardware.media.bufferpool@1.0.so -android.hardware.media.bufferpool@2.0.so -android.hardware.media.c2@1.0.so -android.hardware.media.omx@1.0.so -android.hardware.media@1.0.so -android.hardware.memtrack@1.0.so -android.hardware.neuralnetworks@1.0.so -android.hardware.neuralnetworks@1.1.so -android.hardware.neuralnetworks@1.2.so -android.hardware.nfc@1.0.so -android.hardware.nfc@1.1.so -android.hardware.nfc@1.2.so -android.hardware.oemlock@1.0.so -android.hardware.power.stats@1.0.so -android.hardware.power@1.0.so -android.hardware.power@1.1.so -android.hardware.power@1.2.so -android.hardware.power@1.3.so -android.hardware.radio.config@1.0.so -android.hardware.radio.config@1.1.so -android.hardware.radio.config@1.2.so -android.hardware.radio.deprecated@1.0.so -android.hardware.radio@1.0.so -android.hardware.radio@1.1.so -android.hardware.radio@1.2.so -android.hardware.radio@1.3.so -android.hardware.radio@1.4.so -android.hardware.secure_element@1.0.so -android.hardware.secure_element@1.1.so -android.hardware.sensors@1.0.so -android.hardware.sensors@2.0.so -android.hardware.soundtrigger@2.0.so -android.hardware.soundtrigger@2.0-core.so -android.hardware.soundtrigger@2.1.so -android.hardware.soundtrigger@2.2.so -android.hardware.tetheroffload.config@1.0.so -android.hardware.tetheroffload.control@1.0.so -android.hardware.thermal@1.0.so -android.hardware.thermal@1.1.so -android.hardware.thermal@2.0.so -android.hardware.tv.cec@1.0.so -android.hardware.tv.cec@2.0.so -android.hardware.tv.input@1.0.so -android.hardware.usb.gadget@1.0.so -android.hardware.usb@1.0.so -android.hardware.usb@1.1.so -android.hardware.usb@1.2.so -android.hardware.vibrator@1.0.so -android.hardware.vibrator@1.1.so -android.hardware.vibrator@1.2.so -android.hardware.vibrator@1.3.so -android.hardware.vr@1.0.so -android.hardware.weaver@1.0.so -android.hardware.wifi.hostapd@1.0.so -android.hardware.wifi.hostapd@1.1.so -android.hardware.wifi.offload@1.0.so -android.hardware.wifi.supplicant@1.0.so -android.hardware.wifi.supplicant@1.1.so -android.hardware.wifi.supplicant@1.2.so -android.hardware.wifi@1.0.so -android.hardware.wifi@1.1.so -android.hardware.wifi@1.2.so -android.hardware.wifi@1.3.so -android.hidl.allocator@1.0.so -android.hidl.memory.block@1.0.so -android.hidl.token@1.0.so -android.hidl.token@1.0-utils.so -android.system.net.netd@1.0.so -android.system.net.netd@1.1.so -android.system.suspend@1.0.so -android.system.wifi.keystore@1.0.so -libadf.so -libaudioroute.so -libaudioutils.so -libbinder.so -libcamera_client.so -libcamera_metadata.so -libcap.so -libclang_rt.scudo-aarch64-android.so -libclang_rt.scudo-arm-android.so -libclang_rt.scudo_minimal-aarch64-android.so -libclang_rt.scudo_minimal-arm-android.so -libclang_rt.ubsan_minimal-aarch64-android.so -libclang_rt.ubsan_minimal-arm-android.so -libclang_rt.ubsan_standalone-aarch64-android.so -libclang_rt.ubsan_standalone-arm-android.so -libcn-cbor.so -libcodec2.so -libcrypto.so -libcrypto_utils.so -libcurl.so -libdiskconfig.so -libdumpstateutil.so -libevent.so -libexif.so -libexpat.so -libfmq.so -libgatekeeper.so -libgui.so -libhardware_legacy.so -libhidlallocatorutils.so -libhidlcache.so -libjpeg.so -libkeymaster_messages.so -libkeymaster_portable.so -libldacBT_abr.so -libldacBT_enc.so -liblz4.so -libmedia_helper.so -libmedia_omx.so -libmemtrack.so -libminijail.so -libmkbootimg_abi_check.so -libnetutils.so -libnl.so -libpcre2.so -libpiex.so -libpng.so -libpower.so -libprocinfo.so -libprotobuf-cpp-full.so -libprotobuf-cpp-lite.so -libpuresoftkeymasterdevice.so -libradio_metadata.so -libselinux.so -libsoftkeymasterdevice.so -libspeexresampler.so -libsqlite.so -libssl.so -libstagefright_bufferpool@2.0.so -libstagefright_bufferqueue_helper.so -libstagefright_foundation.so -libstagefright_omx.so -libstagefright_omx_utils.so -libstagefright_xmlparser.so -libsysutils.so -libtinyalsa.so -libtinyxml2.so -libui.so -libusbhost.so -libwifi-system-iface.so -libxml2.so -libyuv.so -libziparchive.so diff --git a/configs/vndkprivate.libraries.29.txt b/configs/vndkprivate.libraries.29.txt deleted file mode 100644 index 99faf5a..0000000 --- a/configs/vndkprivate.libraries.29.txt +++ /dev/null @@ -1,5 +0,0 @@ -libbacktrace.so -libbinderthreadstate.so -libblas.so -libcompiler_rt.so -libft2.so diff --git a/framework_manifest.xml b/framework_manifest.xml deleted file mode 100644 index f618764..0000000 --- a/framework_manifest.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - vendor.lineage.power - hwbinder - 1.0 - - ILineagePower - default - - - - vendor.lineage.touch - hwbinder - 1.0 - - IGloveMode - default - - - diff --git a/manifest.xml b/manifest.xml index 1abb7f4..80aa700 100644 --- a/manifest.xml +++ b/manifest.xml @@ -358,16 +358,6 @@ @3.0::ISehLight/default - - vendor.samsung.hardware.miscpower - hwbinder - 2.0 - - ISehMiscPower - default - - @2.0::ISehMiscPower/default - vendor.samsung.hardware.radio hwbinder @@ -408,36 +398,6 @@ @2.0::ISehChannel/imsd @2.0::ISehChannel/imsd2 - - vendor.samsung.hardware.security.vaultkeeper - hwbinder - 1.0 - - ISehVaultKeeper - default - - @1.0::ISehVaultKeeper/default - - - vendor.samsung.hardware.security.widevine.keyprovisioning - hwbinder - 1.0 - - ISehWidevineKeyProvisioning - default - - @1.0::ISehWidevineKeyProvisioning/default - - - vendor.samsung.hardware.snap - hwbinder - 1.1 - - ISehSnap - default - - @1.1::ISehSnap/default - vendor.samsung.hardware.vibrator hwbinder @@ -478,26 +438,6 @@ @2.0::ISehSupplicant/default - - vendor.samsung_slsi.hardware.ExynosHWCServiceTW - hwbinder - 1.0 - - IExynosHWCServiceTW - default - - @1.0::IExynosHWCServiceTW/default - - - vendor.samsung_slsi.hardware.configstore - hwbinder - 1.0 - - IExynosHWCConfigs - default - - @1.0::IExynosHWCConfigs/default - vendor.samsung_slsi.hardware.radio hwbinder @@ -522,4 +462,22 @@ @1.0::ITeeRegistry/default + + vendor.lineage.power + hwbinder + 1.0 + + ILineagePower + default + + + + vendor.lineage.touch + hwbinder + 1.0 + + IGloveMode + default + + diff --git a/power/Android.bp b/power/Android.bp index bfa87c6..279688d 100644 --- a/power/Android.bp +++ b/power/Android.bp @@ -35,6 +35,7 @@ cc_binary { ], static_libs: ["libc++fs"], + vendor: true, init_rc: ["android.hardware.power@1.0-service.universal7904.rc"], relative_install_path: "hw", diff --git a/power/android.hardware.power@1.0-service.universal7904.rc b/power/android.hardware.power@1.0-service.universal7904.rc index bc19e4d..6d2343f 100644 --- a/power/android.hardware.power@1.0-service.universal7904.rc +++ b/power/android.hardware.power@1.0-service.universal7904.rc @@ -1,4 +1,4 @@ -service vendor.power-hal-1-0 /system/bin/hw/android.hardware.power@1.0-service.universal7904 +service vendor.power-hal-1-0 /vendor/bin/hw/android.hardware.power@1.0-service.universal7904 class hal user system group system diff --git a/product.prop b/product.prop index af40089..4830dac 100644 --- a/product.prop +++ b/product.prop @@ -6,6 +6,3 @@ persist.sys.sf.disable_blurs=1 ro.lmk.log_stats=true ro.lmk.use_minfree_levels=true ro.lmk.use_psi=false - -# VNDK -ro.vndk.lite=false diff --git a/proprietary-files.txt b/proprietary-files.txt index 305a3e5..444187d 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1,8 +1,5 @@ # All blobs below are extracted from m20ltedd-user-10-QP1A.190711.020-M205FDDU6CTK1-release-keys -# Camera -lib/libcamera_client.so:system_ext/apex/com.android.vndk.v29/lib/libcamera_client.so - # Vendor-m20lte vendor/app/mcRegistry/00060308060501020000000000000000.tlbin vendor/app/mcRegistry/07010000000000000000000000000000.tlbin @@ -24,8 +21,6 @@ vendor/app/mcRegistry/ffffffffd0000000000000000000000a.tlbin vendor/app/mcRegistry/ffffffffd0000000000000000000000e.tlbin vendor/app/mcRegistry/ffffffffd00000000000000000000016.tlbin vendor/app/mcRegistry/ffffffffd00000000000000000000045.drbin -vendor/bin/argosd -vendor/bin/cass vendor/bin/cbd vendor/bin/hw/android.hardware.drm@1.2-service.widevine vendor/bin/hw/android.hardware.health@2.0-service.samsung @@ -39,12 +34,8 @@ vendor/bin/hw/vendor.samsung.hardware.biometrics.fingerprint@3.0-service vendor/bin/hw/vendor.samsung.hardware.camera.provider@3.0-service vendor/bin/hw/vendor.samsung.hardware.gnss@2.0-service vendor/bin/hw/vendor.samsung.hardware.light@3.0-service -vendor/bin/hw/vendor.samsung.hardware.miscpower@2.0-service -vendor/bin/hw/vendor.samsung.hardware.snap@1.1-service vendor/bin/hw/vendor.samsung.hardware.vibrator@2.0-service vendor/bin/hw/vendor.samsung.hardware.wifi@2.0-service -vendor/bin/hw/vendor.samsung_slsi.hardware.ExynosHWCServiceTW@1.0-service -vendor/bin/hw/vendor.samsung_slsi.hardware.configstore@1.0-service vendor/bin/hw/vendor.trustonic.tee@1.0-service vendor/bin/hw/vendor.trustonic.teeregistry@1.0-service vendor/bin/hw/wpa_supplicant @@ -55,22 +46,12 @@ vendor/bin/moredump.bin vendor/bin/secril_config_svc vendor/bin/slsi_wlan_udi_log vendor/bin/slsi_wlan_udi_log_decode -vendor/bin/snap_utility_32 -vendor/bin/snap_utility_64 vendor/bin/test_model.json -vendor/bin/vaultkeeperd -vendor/bin/vendor.samsung.hardware.security.vaultkeeper@1.0-service -vendor/bin/vendor.samsung.hardware.security.widevine.keyprovisioning@1.0-service vendor/bin/wlbtd vendor/bin/wvkprov vendor/etc/SoundBoosterParam.txt vendor/etc/a2dp_audio_policy_configuration.xml vendor/etc/audio_board_info.xml -vendor/etc/audio_effects.xml -vendor/etc/audio_effects_common.conf -vendor/etc/audio_effects_sec.xml -vendor/etc/audio_policy_configuration.xml -vendor/etc/audio_policy_configuration_sec.xml vendor/etc/audio_policy_volumes.xml vendor/etc/audio_policy_volumes_sec.xml vendor/etc/bluetooth/bt_did.conf @@ -98,26 +79,18 @@ vendor/etc/init/hostapd.android.rc vendor/etc/init/init.baseband.rc vendor/etc/init/init.exynos7904.usb.rc vendor/etc/init/init.gps.rc -vendor/etc/init/init.samsung.bsp.rc vendor/etc/init/init.vendor.onebinary.rc vendor/etc/init/init.vendor.rilchip.rc vendor/etc/init/init.vendor.rilcommon.rc vendor/etc/init/mobicore.rc -vendor/etc/init/snap_utility.rc vendor/etc/init/vendor.samsung.hardware.biometrics.fingerprint@3.0-service.rc vendor/etc/init/vendor.samsung.hardware.camera.provider@3.0-service.rc vendor/etc/init/vendor.samsung.hardware.gnss@2.0-service.rc vendor/etc/init/vendor.samsung.hardware.light@3.0-service.rc -vendor/etc/init/vendor.samsung.hardware.miscpower@2.0-service.rc -vendor/etc/init/vendor.samsung.hardware.security.widevine.keyprovisioning@1.0-service.rc -vendor/etc/init/vendor.samsung.hardware.snap@1.1-service.rc vendor/etc/init/vendor.samsung.hardware.vibrator@2.0-service.rc vendor/etc/init/vendor.samsung.hardware.wifi@2.0-service.rc -vendor/etc/init/vendor.samsung_slsi.hardware.ExynosHWCServiceTW@1.0-service.rc -vendor/etc/init/vendor.samsung_slsi.hardware.configstore@1.0-service.rc vendor/etc/init/vendor.trustonic.tee@1.0-service.rc vendor/etc/init/vendor.trustonic.teeregistry@1.0-service.rc -vendor/etc/init/vk_kinibi.rc vendor/etc/init/wifi.rc vendor/etc/init/wifi_slsi.rc vendor/etc/media_codecs.xml @@ -412,7 +385,6 @@ vendor/lib/vendor.samsung.hardware.camera.provider@3.0.so vendor/lib/vendor.samsung.hardware.gnss@2.0.so vendor/lib/vendor.samsung.hardware.health@1.0.so vendor/lib/vendor.samsung.hardware.light@3.0.so -vendor/lib/vendor.samsung.hardware.miscpower@2.0.so vendor/lib/vendor.samsung.hardware.nfc@2.0.so vendor/lib/vendor.samsung.hardware.radio.bridge@2.0.so vendor/lib/vendor.samsung.hardware.radio.bridge@2.0_vendor.so @@ -425,9 +397,6 @@ vendor/lib/vendor.samsung.hardware.vibrator@2.0.so vendor/lib/vendor.samsung.hardware.wifi.hostapd@2.0.so vendor/lib/vendor.samsung.hardware.wifi.supplicant@2.0.so vendor/lib/vendor.samsung.hardware.wifi@2.0.so -vendor/lib/vendor.samsung_slsi.hardware.ExynosHWCServiceTW@1.0.so -vendor/lib/vendor.samsung_slsi.hardware.configstore-utils.so -vendor/lib/vendor.samsung_slsi.hardware.configstore@1.0.so vendor/lib/vendor.trustonic.tee@1.0.so vendor/lib/vendor.trustonic.teeregistry@1.0.so vendor/lib64/camera.device@1.0-impl.so @@ -559,7 +528,6 @@ vendor/lib64/vendor.samsung.hardware.camera.provider@3.0.so vendor/lib64/vendor.samsung.hardware.gnss@2.0.so vendor/lib64/vendor.samsung.hardware.health@1.0.so vendor/lib64/vendor.samsung.hardware.light@3.0.so -vendor/lib64/vendor.samsung.hardware.miscpower@2.0.so vendor/lib64/vendor.samsung.hardware.nfc@2.0.so vendor/lib64/vendor.samsung.hardware.radio.bridge@2.0.so vendor/lib64/vendor.samsung.hardware.radio.bridge@2.0_vendor.so @@ -572,9 +540,6 @@ vendor/lib64/vendor.samsung.hardware.vibrator@2.0.so vendor/lib64/vendor.samsung.hardware.wifi.hostapd@2.0.so vendor/lib64/vendor.samsung.hardware.wifi.supplicant@2.0.so vendor/lib64/vendor.samsung.hardware.wifi@2.0.so -vendor/lib64/vendor.samsung_slsi.hardware.ExynosHWCServiceTW@1.0.so -vendor/lib64/vendor.samsung_slsi.hardware.configstore-utils.so -vendor/lib64/vendor.samsung_slsi.hardware.configstore@1.0.so vendor/lib64/vendor.trustonic.tee@1.0.so vendor/lib64/vendor.trustonic.teeregistry@1.0.so vendor/ueventd.rc diff --git a/rootdir/Android.mk b/rootdir/Android.mk index c176e89..390ef1e 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -1,13 +1,5 @@ LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) -LOCAL_MODULE := init.universal7904.rc -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/$(LOCAL_MODULE) -LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/init -include $(BUILD_PREBUILT) - include $(CLEAR_VARS) LOCAL_MODULE := init.usb_accessory.rc LOCAL_MODULE_TAGS := optional @@ -21,7 +13,7 @@ LOCAL_MODULE := fstab.enableswap LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := etc/$(LOCAL_MODULE) -LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC) include $(BUILD_PREBUILT) include $(CLEAR_VARS) diff --git a/rootdir/etc/init.exynos7904.rc b/rootdir/etc/init.exynos7904.rc index 0cc2f64..4a39533 100644 --- a/rootdir/etc/init.exynos7904.rc +++ b/rootdir/etc/init.exynos7904.rc @@ -5,6 +5,13 @@ on early-init mount debugfs /sys/kernel/debug /sys/kernel/debug on init + # Fastcharge + chown system radio /sys/class/sec/switch/afc_disable + + # ZRAM parameters + write /proc/sys/vm/page-cluster 0 + write /proc/sys/vm/swappiness 100 + start watchdogd mkdir /preload 0771 system system @@ -41,6 +48,9 @@ on late-fs # start mobicore on post-fs + # Allow writing to the kernel trace log. + chmod 0222 /sys/kernel/debug/tracing/trace_marker + # set RLIMIT_MEMLOCK to 64MB setrlimit 8 67108864 67108864 @@ -255,9 +265,6 @@ on post-fs-data on boot -# SSWAP - write /proc/sys/vm/swappiness 145 - setprop wifi.interface wlan0 # Allow to access debugfs for system:system @@ -399,25 +406,10 @@ on boot write /dev/cpuset/foreground/selective_boost 1 write /dev/cpuset/cameraserver/selective_boost 1 -# Support DM logging -# chmod 0770 /system/bin/dmd - -# Support Virtual Com - chmod 0770 /system/bin/vcd - -# Support AP/CP log dump -# chmod 0770 /system/bin/sced - # Permission for UART SWITCH chmod 0660 /sys/class/sec/switch/uart_sel chown system system /sys/class/sec/switch/uart_sel -#on nonencrypted -# mkdir /data/misc/mcRegistry 0775 system drmrpc - -#on property:vold.decrypt=trigger_restart_framework -# mkdir /data/misc/mcRegistry 0775 system drmrpc - on fs mount_all /vendor/etc/fstab.${ro.hardware} setprop ro.crypto.fuse_sdcard true @@ -561,20 +553,16 @@ on fs chown system radio /sys/class/fingerprint/fingerprint/adm chown system radio /sys/class/fingerprint/fingerprint/bfs_values -# Copy DRM Key -# copy /system/app/wv.keys /factory/wv.keys - -# Permission for DRM Key -# chmod 0644 /factory/wv.keys - # Permissions for System LSI NFC # NFC : Permissions for NFC - chmod 0660 /dev/sec-nfc - chown nfc nfc /dev/sec-nfc + chmod 0660 /dev/sec-nfc + chown nfc nfc /dev/sec-nfc # Permissions for S.LSI ESE - chmod 0660 /dev/p3 - chown system system /dev/p3 + chmod 0660 /dev/p3 + chown system system /dev/p3 +on property:sys.boot_completed=1 + swapon_all /vendor/etc/fstab.enableswap # Permission for flashlight control for HAL3.3 # The Istor espresso board does not have the flash led h/w, So the below permission line are blocked. @@ -587,15 +575,6 @@ on fs #load ecd firmware write /proc/ecd/load_firmware 1 -# ARGOSD network_throughput - chown system system /dev/network_throughput - -# ARGOSD -service argos-daemon /vendor/bin/argosd - class main - user system - group system radio - # faced service faced /system/bin/faced class late_start @@ -608,19 +587,6 @@ service cp_vername /vendor/bin/cp_vername.sh /sys/class/nfc_test/test group system oneshot -# MobiCore startup -#service mobicore /vendor/bin/mcDriverDaemon -r /vendor/app/mcRegistry/020a0000000000000000000000000000.drbin -r /vendor/app/mcRegistry/FFFFFFFFD00000000000000000000016.tlbin -# user drmrpc -# group drmrpc -# class core -# seclabel u:r:tee:s0 - -#service trustonic-proxy /system/bin/trustonic_tee_proxy -# class core -# user system -# group system drmrpc -# seclabel u:r:tee:s0 - service fuse_sdcard /system/bin/sdcard -u 1023 -g 1023 -d /mnt/media_rw/sdcard /storage/sdcard class late_start disabled @@ -637,13 +603,6 @@ service abox /vendor/bin/main_abox 14a50000.abox /data/log/abox user audioserver group system -# LPM -on property:ro.bootmode=charger - wait /dev/block/platform/13500000.dwmmc0/by-name/EFS - mount ext4 /dev/block/platform/13500000.dwmmc0/by-name/EFS /mnt/vendor/efs nosuid nodev noatime noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic - mkdir /mnt/vendor/efs/lpm 0775 system system - class_start sec-charger - # Set watchdog timer to 30 seconds and pet it every 10 seconds to get a 20 second margin service watchdogd /system/bin/watchdogd 10 20 class core @@ -739,16 +698,9 @@ service tzts_service /vendor/bin/tzts_daemon group system disabled -# SSWAP -service swapon /sbin/sswap -s -f 2048 - class core - user root - group root - seclabel u:r:sswap:s0 - oneshot - -# Remosaic daemon of Camera -#service remosaic_daemon /vendor/bin/remosaic_daemon -# class late_start -# user cameraserver -# group cameraserver +service charger /system/bin/charger + class charger + user system + group system graphics input + capabilities SYS_BOOT + seclabel u:r:charger:s0 diff --git a/rootdir/etc/init.universal7904.rc b/rootdir/etc/init.universal7904.rc deleted file mode 100644 index efdde79..0000000 --- a/rootdir/etc/init.universal7904.rc +++ /dev/null @@ -1,87 +0,0 @@ -on init - # Disable vendor overlay - mount none /vendor/lost+found /vendor/overlay bind - - # Fastcharge - chown system radio /sys/class/sec/switch/afc_disable - - # ZRAM parameters - write /proc/sys/vm/page-cluster 0 - write /proc/sys/vm/swappiness 100 - -on property:sys.boot_completed=1 - swapon_all /system/etc/fstab.enableswap - - # Disable sw watchdog - write /dev/watchdog1 "V" - -service ExynosHWCServiceTW /system/bin/true - oneshot - disabled - -service ExynosHWCConfigs /system/bin/true - oneshot - disabled - -service argos-daemon /system/bin/true - oneshot - disabled - -service atnserv /system/bin/true - oneshot - disabled - -service icccserv /system/bin/true - oneshot - disabled - -service proca /system/bin/true - oneshot - disabled - -service secure_storage /system/bin/true - oneshot - disabled - -service sec-miscpower-2-0 /system/bin/true - oneshot - disabled - -service sec_wsm_service /system/bin/true - oneshot - disabled - -service snapserv /system/bin/true - oneshot - disabled - -service snap_utility_32 /system/bin/true - oneshot - disabled - -service snap_utility_64 /system/bin/true - oneshot - disabled - -service timaserv /system/bin/true - oneshot - disabled - -service ucmtlc-hal-service /system/bin/true - oneshot - disabled - -service vaultkeeper /system/bin/true - oneshot - disabled - -service vaultkeeper_hal /system/bin/true - oneshot - disabled - -service charger /system/bin/charger - class charger - user system - group system graphics input - capabilities SYS_BOOT - seclabel u:r:charger:s0 diff --git a/sensors/Android.mk b/sensors/Android.mk deleted file mode 100644 index dee24fb..0000000 --- a/sensors/Android.mk +++ /dev/null @@ -1,72 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# Copyright (C) 2020 The LineageOS Project - -LOCAL_PATH := hardware/samsung/hidl/sensors/1.0 - -include $(CLEAR_VARS) - -LOCAL_MODULE := android.hardware.sensors@1.0-impl.samsung-universal7904 -LOCAL_MODULE_TAGS := optional -LOCAL_VENDOR_MODULE := true - -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_PRODUCT)/vendor_overlay/29/lib -LOCAL_MODULE_PATH_64 := $(TARGET_OUT_PRODUCT)/vendor_overlay/29/lib64 -LOCAL_MODULE_RELATIVE_PATH := hw - -LOCAL_SRC_FILES := \ - Sensors.cpp - -LOCAL_SHARED_LIBRARIES := \ - liblog \ - libcutils \ - libhardware \ - libhidlbase \ - android.hardware.sensors@1.0 - -LOCAL_STATIC_LIBRARIES := \ - libbase \ - libutils \ - android.hardware.sensors@1.0-convert \ - multihal - -LOCAL_POST_INSTALL_CMD := mkdir -p $(LOCAL_MODULE_PATH_32)/hw -LOCAL_POST_INSTALL_CMD += ; mkdir -p $(LOCAL_MODULE_PATH_64)/hw -LOCAL_POST_INSTALL_CMD += ; ln -sf $(LOCAL_MODULE).so $(LOCAL_MODULE_PATH_32)/hw/android.hardware.sensors@1.0-impl.so -LOCAL_POST_INSTALL_CMD += ; ln -sf $(LOCAL_MODULE).so $(LOCAL_MODULE_PATH_64)/hw/android.hardware.sensors@1.0-impl.so - -LOCAL_REQUIRED_MODULES := android.hardware.sensors@1.0-impl_vndk-30.samsung-universal7904 - -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) - -LOCAL_MODULE := android.hardware.sensors@1.0-impl_vndk-30.samsung-universal7904 -LOCAL_MODULE_TAGS := optional -LOCAL_VENDOR_MODULE := true - -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_PRODUCT)/vendor_overlay/30/lib -LOCAL_MODULE_PATH_64 := $(TARGET_OUT_PRODUCT)/vendor_overlay/30/lib64 -LOCAL_MODULE_RELATIVE_PATH := hw - -LOCAL_SRC_FILES := \ - Sensors.cpp - -LOCAL_SHARED_LIBRARIES := \ - liblog \ - libcutils \ - libhardware \ - libhidlbase \ - android.hardware.sensors@1.0 - -LOCAL_STATIC_LIBRARIES := \ - libbase \ - libutils \ - android.hardware.sensors@1.0-convert \ - multihal - -LOCAL_POST_INSTALL_CMD := mkdir -p $(LOCAL_MODULE_PATH_32)/hw -LOCAL_POST_INSTALL_CMD += ; mkdir -p $(LOCAL_MODULE_PATH_64)/hw -LOCAL_POST_INSTALL_CMD += ; ln -sf $(LOCAL_MODULE).so $(LOCAL_MODULE_PATH_32)/hw/android.hardware.sensors@1.0-impl.so -LOCAL_POST_INSTALL_CMD += ; ln -sf $(LOCAL_MODULE).so $(LOCAL_MODULE_PATH_64)/hw/android.hardware.sensors@1.0-impl.so - -include $(BUILD_SHARED_LIBRARY) diff --git a/sepolicy/private/app.te b/sepolicy/private/app.te deleted file mode 100644 index f2f2bef..0000000 --- a/sepolicy/private/app.te +++ /dev/null @@ -1 +0,0 @@ -get_prop(appdomain, exported_camera_prop); diff --git a/sepolicy/private/bootanim.te b/sepolicy/private/bootanim.te deleted file mode 100644 index 79257f4..0000000 --- a/sepolicy/private/bootanim.te +++ /dev/null @@ -1 +0,0 @@ -get_prop(bootanim, userspace_reboot_exported_prop) diff --git a/sepolicy/private/fastbootd.te b/sepolicy/private/fastbootd.te deleted file mode 100644 index 742f31e..0000000 --- a/sepolicy/private/fastbootd.te +++ /dev/null @@ -1,5 +0,0 @@ -recovery_only(` -userdebug_or_eng(` -permissive fastbootd; -') -') diff --git a/sepolicy/private/file.te b/sepolicy/private/file.te deleted file mode 100644 index 308be85..0000000 --- a/sepolicy/private/file.te +++ /dev/null @@ -1,3 +0,0 @@ -type sysfs_battery, sysfs_type, fs_type; -type sysfs_sec_tsp, fs_type, sysfs_type; -type sysfs_sec_switch, fs_type, sysfs_type; diff --git a/sepolicy/private/file_contexts b/sepolicy/private/file_contexts deleted file mode 100644 index 78c8a2c..0000000 --- a/sepolicy/private/file_contexts +++ /dev/null @@ -1,11 +0,0 @@ -# Block device for ZRAM -/dev/block/zram0 u:object_r:swap_block_device:s0 - -# HALs -/system/bin/hw/lineage\.touch@1\.0-service\.samsung u:object_r:hal_touch_samsung_exec:s0 -/system/bin/hw/android\.hardware\.power@1\.0-service\.universal7904 u:object_r:hal_power_default_exec:s0 -/system/bin/hw/lineage\.fastcharge@1\.0-service\.samsung u:object_r:hal_fastcharge_samsung_exec:s0 - -# Vendor overlay -/(product|system/product)/vendor_overlay/[0-9]+/etc(/.*)? u:object_r:vendor_configs_file:s0 -/(product|system/product)/vendor_overlay/[0-9]+/lib(64)?/hw u:object_r:vendor_hal_file:s0 diff --git a/sepolicy/private/genfs_contexts b/sepolicy/private/genfs_contexts deleted file mode 100644 index f81d103..0000000 --- a/sepolicy/private/genfs_contexts +++ /dev/null @@ -1,6 +0,0 @@ -genfscon sysfs /devices/virtual/sec/tsp u:object_r:sysfs_sec_tsp:s0 -genfscon sysfs /devices/virtual/sec/switch u:object_r:sysfs_sec_switch:s0 -genfscon sysfs /devices/platform/13840000.i2c/i2c-10/10-003d/s2mu004-charger/power_supply/s2mu004-charger u:object_r:sysfs_battery:s0 -genfscon sysfs /devices/platform/13840000.i2c/i2c-10/10-003d/s2mu004-charger/power_supply/otg u:object_r:sysfs_battery:s0 -genfscon sysfs /devices/platform/13840000.i2c/i2c-10/10-003d/s2mu004-muic/power_supply/muic-manager u:object_r:sysfs_battery:s0 -genfscon sysfs /devices/platform/13830000.i2c/i2c-9/9-003b/power_supply/s2mu004-fuelgauge u:object_r:sysfs_battery:s0 diff --git a/sepolicy/private/hal_audio.te b/sepolicy/private/hal_audio.te deleted file mode 100644 index 0ff691a..0000000 --- a/sepolicy/private/hal_audio.te +++ /dev/null @@ -1,2 +0,0 @@ -# Allow hal audio to use wakelock -wakelock_use(hal_audio) diff --git a/sepolicy/private/hal_fastcharge_samsung.te b/sepolicy/private/hal_fastcharge_samsung.te deleted file mode 100644 index e7895e9..0000000 --- a/sepolicy/private/hal_fastcharge_samsung.te +++ /dev/null @@ -1,10 +0,0 @@ -type hal_fastcharge_samsung, domain, coredomain; -hal_server_domain(hal_fastcharge_samsung, hal_lineage_fastcharge) - -type hal_fastcharge_samsung_exec, exec_type, system_file_type, file_type; -init_daemon_domain(hal_fastcharge_samsung) - -allow hal_fastcharge_samsung sysfs_sec_switch:dir search; -allow hal_fastcharge_samsung sysfs_sec_switch:file rw_file_perms; - -set_prop(hal_fastcharge_samsung, sec_fastcharge_prop) diff --git a/sepolicy/private/hal_health.te b/sepolicy/private/hal_health.te deleted file mode 100644 index 7338ac5..0000000 --- a/sepolicy/private/hal_health.te +++ /dev/null @@ -1 +0,0 @@ -r_dir_file(hal_health, sysfs_battery) diff --git a/sepolicy/private/hal_power.te b/sepolicy/private/hal_power.te deleted file mode 100644 index 4fb868a..0000000 --- a/sepolicy/private/hal_power.te +++ /dev/null @@ -1,7 +0,0 @@ -# Allow power HAL to write /sys/class/sec/tsp -r_dir_file(hal_power, sysfs_sec_tsp) -allow hal_power sysfs_sec_tsp:file write; - -# Allow power HAL to write /sys/devices/system/cpu -r_dir_file(hal_power, sysfs_devices_system_cpu) -allow hal_power sysfs_devices_system_cpu:file write; diff --git a/sepolicy/private/hal_touch_samsung.te b/sepolicy/private/hal_touch_samsung.te deleted file mode 100644 index 91da661..0000000 --- a/sepolicy/private/hal_touch_samsung.te +++ /dev/null @@ -1,8 +0,0 @@ -type hal_touch_samsung, domain, coredomain; -hal_server_domain(hal_touch_samsung, hal_lineage_touch) - -type hal_touch_samsung_exec, system_file_type, exec_type, file_type; -init_daemon_domain(hal_touch_samsung) - -allow hal_touch_samsung sysfs_sec_tsp:dir search; -allow hal_touch_samsung sysfs_sec_tsp:file rw_file_perms; diff --git a/sepolicy/private/healthd.te b/sepolicy/private/healthd.te deleted file mode 100644 index 77797fd..0000000 --- a/sepolicy/private/healthd.te +++ /dev/null @@ -1 +0,0 @@ -r_dir_file(healthd, sysfs_battery) diff --git a/sepolicy/private/init.te b/sepolicy/private/init.te deleted file mode 100644 index 3f86b88..0000000 --- a/sepolicy/private/init.te +++ /dev/null @@ -1,2 +0,0 @@ -allow init vendor_overlay_file:dir mounton; -allow init watchdog_device:file rw_file_perms; diff --git a/sepolicy/private/property.te b/sepolicy/private/property.te deleted file mode 100644 index 649d1e8..0000000 --- a/sepolicy/private/property.te +++ /dev/null @@ -1 +0,0 @@ -system_internal_prop(sec_fastcharge_prop) diff --git a/sepolicy/private/property_contexts b/sepolicy/private/property_contexts deleted file mode 100644 index b3e60c0..0000000 --- a/sepolicy/private/property_contexts +++ /dev/null @@ -1 +0,0 @@ -persist.vendor.sec.fastchg_enabled u:object_r:sec_fastcharge_prop:s0 diff --git a/sepolicy/private/sec_system_init_shell.te b/sepolicy/private/sec_system_init_shell.te deleted file mode 100644 index 73c3250..0000000 --- a/sepolicy/private/sec_system_init_shell.te +++ /dev/null @@ -1,3 +0,0 @@ -type sec_system_init_shell, domain; - -dontaudit sec_system_init_shell domain:file { getattr open }; diff --git a/sepolicy/private/system_server.te b/sepolicy/private/system_server.te deleted file mode 100644 index 0010093..0000000 --- a/sepolicy/private/system_server.te +++ /dev/null @@ -1,3 +0,0 @@ -get_prop(system_server, exported_camera_prop); -get_prop(system_server, userspace_reboot_config_prop) -get_prop(system_server, userspace_reboot_exported_prop) diff --git a/sepolicy/private/zygote.te b/sepolicy/private/zygote.te deleted file mode 100644 index d7df793..0000000 --- a/sepolicy/private/zygote.te +++ /dev/null @@ -1 +0,0 @@ -get_prop(zygote, exported_camera_prop); diff --git a/universal7904-common.mk b/universal7904-common.mk index dbb17ca..af5578c 100644 --- a/universal7904-common.mk +++ b/universal7904-common.mk @@ -18,10 +18,8 @@ PRODUCT_PACKAGES += \ audio.usb.default PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/audio_policy_configuration.xml:$(TARGET_COPY_OUT_PRODUCT)/vendor_overlay/29/etc/audio_policy_configuration.xml \ - $(LOCAL_PATH)/configs/audio_policy_configuration.xml:$(TARGET_COPY_OUT_PRODUCT)/vendor_overlay/30/etc/audio_policy_configuration.xml \ - $(LOCAL_PATH)/configs/audio_effects.xml:$(TARGET_COPY_OUT_PRODUCT)/vendor_overlay/29/etc/audio_effects_sec.xml \ - $(LOCAL_PATH)/configs/audio_effects.xml:$(TARGET_COPY_OUT_PRODUCT)/vendor_overlay/30/etc/audio_effects_sec.xml + $(LOCAL_PATH)/configs/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ + $(LOCAL_PATH)/configs/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml # Bluetooth PRODUCT_PACKAGES += \ @@ -46,7 +44,7 @@ PRODUCT_PACKAGES += \ # FastCharge PRODUCT_PACKAGES += \ - lineage.fastcharge@1.0-service.samsung + vendor.lineage.fastcharge@1.0-service.samsung # Gatekeeper PRODUCT_PACKAGES += \ @@ -72,7 +70,6 @@ PRODUCT_PACKAGES += \ # Init PRODUCT_PACKAGES += \ - init.universal7904.rc \ init.usb_accessory.rc \ fstab.enableswap \ init.exynos7904.rc @@ -171,23 +168,18 @@ PRODUCT_PACKAGES += \ # Trust HAL PRODUCT_PACKAGES += \ - lineage.trust@1.0-service + vendor.lineage.trust@1.0-service # Touch PRODUCT_PACKAGES += \ - lineage.touch@1.0-service.samsung + vendor.lineage.touch@1.0-service.samsung # USB PRODUCT_PACKAGES += \ android.hardware.usb@1.1-service.typec # VNDK -PRODUCT_EXTRA_VNDK_VERSIONS := 29 - PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/vndkcore.libraries.29.txt:$(TARGET_COPY_OUT_SYSTEM_EXT)/apex/com.android.vndk.v29/etc/vndkcore.libraries.29.txt \ - $(LOCAL_PATH)/configs/vndkprivate.libraries.29.txt:$(TARGET_COPY_OUT_SYSTEM_EXT)/apex/com.android.vndk.v29/etc/vndkprivate.libraries.29.txt \ - $(LOCAL_PATH)/configs/placeholder:$(TARGET_COPY_OUT_SYSTEM_EXT)/apex/com.android.vndk.v29/lib/libstagefright_foundation.so \ prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-sp/libcutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcutils-v29.so \ prebuilts/vndk/v29/arm64/arch-arm-armv8-a/shared/vndk-sp/libcutils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcutils-v29.so