From f8fe2f54266186861303b2d7200a46d0dcfc8535 Mon Sep 17 00:00:00 2001 From: SamarV-121 Date: Wed, 11 Aug 2021 13:14:55 +0530 Subject: [PATCH] universal7885: Cleanup * Alphabetize * Remove packages which are built by default Change-Id: Id678c95765d395ba65477ca6a1b220a2107283dd Signed-off-by: SamarV-121 --- lineage.dependencies | 12 ++++++------ proprietary-files.txt | 22 +++++++++++----------- universal7904-common.mk | 35 +++++++++++++---------------------- 3 files changed, 30 insertions(+), 39 deletions(-) diff --git a/lineage.dependencies b/lineage.dependencies index 487b9c8..cded759 100644 --- a/lineage.dependencies +++ b/lineage.dependencies @@ -1,12 +1,12 @@ [ + { + "repository": "android_device_samsung_slsi_sepolicy", + "target_path": "device/samsung_slsi/sepolicy" + }, { "repository": "android_hardware_samsung", "target_path": "hardware/samsung" }, - { - "repository": "android_kernel_samsung_universal7904", - "target_path": "kernel/samsung/universal7904" - }, { "repository": "android_hardware_samsung_nfc", "target_path": "hardware/samsung/nfc" @@ -24,7 +24,7 @@ "target_path": "hardware/samsung_slsi/scsc_wifibt/wpa_supplicant_lib" }, { - "repository": "android_device_samsung_slsi_sepolicy", - "target_path": "device/samsung_slsi/sepolicy" + "repository": "android_kernel_samsung_universal7904", + "target_path": "kernel/samsung/universal7904" } ] diff --git a/proprietary-files.txt b/proprietary-files.txt index 5a64188..01cc68b 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -37,6 +37,16 @@ vendor/lib/liboemcrypto.so vendor/lib/libwvhidl.so vendor/lib/mediadrm/libwvdrmengine.so +# Fingerprint +vendor/lib/libegis_fp_normal_sensor_test.so +vendor/lib/libgf_in_system_lib.so +vendor/lib/libqfp_sensortest.so +vendor/lib/libsynaFpSensorTestNwd.so +vendor/lib64/libegis_fp_normal_sensor_test.so +vendor/lib64/libgf_in_system_lib.so +vendor/lib64/libqfp_sensortest.so +vendor/lib64/libsynaFpSensorTestNwd.so + # GPS vendor/bin/hw/gpsd vendor/bin/hw/vendor.samsung.hardware.gnss@2.0-service @@ -78,16 +88,6 @@ vendor/lib64/libexynosutils.so|cb42b6ded8fb488c74a6b40c428de36778e96d63 vendor/lib64/libexynosv4l2.so|fb66b93ad867a47d48da44a804d6c4514cbb5713 vendor/lib64/libion_exynos.so|bff127f0d989e6c756dd8cff40847ee5b7560447 -# Fingerprint -vendor/lib/libegis_fp_normal_sensor_test.so -vendor/lib/libgf_in_system_lib.so -vendor/lib/libqfp_sensortest.so -vendor/lib/libsynaFpSensorTestNwd.so -vendor/lib64/libegis_fp_normal_sensor_test.so -vendor/lib64/libgf_in_system_lib.so -vendor/lib64/libqfp_sensortest.so -vendor/lib64/libsynaFpSensorTestNwd.so - # Lights vendor/lib/hw/lights.universal7904.so vendor/lib64/hw/lights.universal7904.so @@ -179,7 +179,7 @@ vendor/lib64/libyasalgo.so vendor/lib/hw/thermal.universal7904.so vendor/lib64/hw/thermal.universal7904.so -# WIFI +# Wifi vendor/bin/hw/macloader vendor/bin/wlbtd vendor/etc/init/wifi_slsi.rc diff --git a/universal7904-common.mk b/universal7904-common.mk index 339bdca..eff7e65 100644 --- a/universal7904-common.mk +++ b/universal7904-common.mk @@ -4,10 +4,6 @@ $(call inherit-product, vendor/samsung/universal7904-common/universal7904-common # Dalvik $(call inherit-product, frameworks/native/build/phone-xhdpi-4096-dalvik-heap.mk) -# Screen density -PRODUCT_AAPT_CONFIG := normal -PRODUCT_AAPT_PREF_CONFIG := xxhdpi - # Audio TARGET_EXCLUDES_AUDIOFX := true @@ -15,9 +11,6 @@ PRODUCT_PACKAGES += \ android.hardware.audio@6.0-impl \ android.hardware.audio.service \ android.hardware.audio.effect@6.0-impl \ - libalsautils \ - libeffects \ - libnbaio_mono \ libtinycompress \ audio.r_submix.default \ audio.usb.default @@ -74,9 +67,7 @@ PRODUCT_PACKAGES += \ android.hardware.graphics.composer@2.1-impl \ android.hardware.graphics.composer@2.1-service \ android.hardware.graphics.mapper@2.0-impl \ - libgui_vendor \ - libhwc2on1adapter \ - libhwc2onfbadapter + libgui_vendor # Health PRODUCT_PACKAGES += \ @@ -128,10 +119,6 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/libnfc-nci.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nci.conf \ $(LOCAL_PATH)/configs/nfcee_access.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/nfcee_access.xml -# Net -PRODUCT_PACKAGES += \ - netutils-wrapper-1.0 - # Overlays DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay-lineage @@ -197,21 +184,25 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ SamsungDoze +# Screen density +PRODUCT_AAPT_CONFIG := normal +PRODUCT_AAPT_PREF_CONFIG := xxhdpi + # Sensors PRODUCT_PACKAGES += \ android.hardware.sensors@1.0-impl.samsung \ android.hardware.sensors@1.0-service \ libsensorndkbridge -# Skip Mount -PRODUCT_COPY_FILES += \ - build/target/product/gsi/gsi_skip_mount.cfg:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/config/skip_mount.cfg - # Shims PRODUCT_PACKAGES += \ libcamera_metadata_helper \ libshim_sensorndkbridge +# Skip Mount +PRODUCT_COPY_FILES += \ + build/target/product/gsi/gsi_skip_mount.cfg:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/config/skip_mount.cfg + # Soong namespaces PRODUCT_SOONG_NAMESPACES += \ $(LOCAL_PATH) @@ -225,14 +216,14 @@ PRODUCT_PACKAGES += \ android.hardware.thermal@1.0-impl \ android.hardware.thermal@1.0-service -# Trust HAL -PRODUCT_PACKAGES += \ - vendor.lineage.trust@1.0-service - # Touch PRODUCT_PACKAGES += \ vendor.lineage.touch@1.0-service.samsung +# Trust HAL +PRODUCT_PACKAGES += \ + vendor.lineage.trust@1.0-service + # USB PRODUCT_PACKAGES += \ android.hardware.usb@1.1-service.typec