From 5c3d3b4d352e39f205ece1aaddbf3f3d9de8a1b1 Mon Sep 17 00:00:00 2001 From: Tad Date: Sun, 30 May 2021 01:55:29 -0400 Subject: [PATCH] Reverts + disable mm-pp removal Revert d7fd127e5fa81892377314ee7ab3a0f648adcf7f Partial revert 1c9a66f896f33d5816b7a99005003984bd19a419 --- Scripts/Common/Deblob.sh | 7 +++---- Scripts/LineageOS-15.1/Functions.sh | 9 +++++++-- Scripts/LineageOS-15.1/Patch.sh | 10 ---------- Scripts/LineageOS-16.0/Functions.sh | 9 +++++++-- Scripts/LineageOS-17.1/Functions.sh | 9 +++++++-- Scripts/LineageOS-17.1/Patch.sh | 8 +------- Scripts/LineageOS-18.1/Functions.sh | 10 ++++++++-- Scripts/LineageOS-18.1/Patch.sh | 3 --- 8 files changed, 33 insertions(+), 32 deletions(-) diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh index 824697d5..b6c92500 100644 --- a/Scripts/Common/Deblob.sh +++ b/Scripts/Common/Deblob.sh @@ -125,10 +125,10 @@ echo "Deblobbing..."; makes=$makes"|DxHDCP.cfg"; #Display Color Tuning [Qualcomm] - blobs=$blobs"|mm-pp-daemon|mm-pp-dpps"; + #blobs=$blobs"|mm-pp-daemon|mm-pp-dpps"; blobs=$blobs"|colorservice.apk|PPPreference.apk|CABLService.apk|QdcmFF.apk"; - blobs=$blobs"|libdisp-aba.so|libmm-abl-oem.so|libmm-abl.so|libmm-als.so|libmm-color-convertor.so|libmm-disp-apis.so|libmm-qdcm.so|libsd_sdk_display.so|libdpps.so"; - blobs=$blobs"|vendor.display.color.*|vendor.display.postproc.*|vendor.qti.hardware.qdutils_disp.*|com.qti.snapdragon.sdk.display.*"; + #blobs=$blobs"|libdisp-aba.so|libmm-abl-oem.so|libmm-abl.so|libmm-als.so|libmm-color-convertor.so|libmm-disp-apis.so|libmm-qdcm.so|libsd_sdk_display.so|libdpps.so"; + #blobs=$blobs"|vendor.display.color.*|vendor.display.postproc.*|vendor.qti.hardware.qdutils_disp.*|com.qti.snapdragon.sdk.display.*"; #DivX (DRM) [DivX] blobs=$blobs"|libDivxDrm.so|libSHIMDivxDrm.so"; @@ -727,7 +727,6 @@ deblobDevice() { rm -f rootdir/etc/init.qti.ims.sh rootdir/init.qti.ims.sh init.qti.ims.sh; #Remove IMS startup script rm -rf IMSEnabler; #Remove IMS compatibility module fi; - #sed -i '/service ppd /a\ \ \ \ disabled' init.*.rc rootdir/init.*.rc rootdir/etc/init.*.rc &> /dev/null || true; rm -rf ifaa org.ifaa.android.manager; #Remove AliPay if [ "$DOS_DEBLOBBER_REMOVE_IPA" = true ]; then rm -rf data-ipa-cfg-mgr; fi; #Remove IPA rm -rf libshimwvm libshims/wvm_shim.cpp; #Remove Google Widevine compatibility module diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index 7e5ec154..ed9ca523 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -101,8 +101,13 @@ enableDexPreOpt() { echo "WITH_DEXPREOPT := true" >> BoardConfig.mk; echo "WITH_DEXPREOPT_DEBUG_INFO := false" >> BoardConfig.mk; echo "WITH_DEXPREOPT_PIC := true" >> BoardConfig.mk; - echo "WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := true" >> BoardConfig.mk; - echo "Enabled core dexpreopt for $1"; + if true; then + echo "WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := false" >> BoardConfig.mk; + echo "Enabled full dexpreopt for $1"; + else + echo "WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := true" >> BoardConfig.mk; + echo "Enabled core dexpreopt for $1"; + fi; fi; cd "$DOS_BUILD_BASE"; } diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index 7115bb6f..1de51490 100644 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -228,25 +228,15 @@ echo "/dev/block/platform/msm_sdcc\.1/by-name/misc u:object_r:misc_block_device: enterAndClear "device/asus/msm8916-common"; rm -rf Android.bp sensors; #exact duplicate in asus/flo #XXX be careful with this -enterAndClear "device/huawei/angler"; -sed -i -e '/mm-pp-d/,+4d' init.angler.rc; - enterAndClear "device/lge/msm8996-common"; sed -i '3itypeattribute hwaddrs misc_block_device_exception;' sepolicy/hwaddrs.te; enterAndClear "device/oneplus/oneplus2"; sed -i 's|etc/permissions/qti_libpermissions.xml|vendor/etc/permissions/qti_libpermissions.xml|' proprietary-files.txt; #Fix outdated path -sed -i -e '/mm-pp-d/,+4d' rootdir/etc/init.qcom.rc; #enterAndClear "device/moto/shamu"; #git revert --no-edit 05fb49518049440f90423341ff25d4f75f10bc0c; #restore releasetools #TODO -enterAndClear "device/nextbit/ether"; -sed -i -e '/mm-pp-d/,+4d' rootdir/init.target.rc; - -enterAndClear "device/zte/axon7"; -sed -i -e '/mm-pp-d/,+4d' rootdir/etc/init.qcom.rc; - #Make changes to all devices cd "$DOS_BUILD_BASE"; if [ "$DOS_LOWRAM_ENABLED" = true ]; then find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'enableLowRam "{}"'; fi; diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index 43c58a96..317520c9 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -92,8 +92,13 @@ enableDexPreOpt() { if [ -f BoardConfig.mk ]; then echo "WITH_DEXPREOPT := true" >> BoardConfig.mk; echo "WITH_DEXPREOPT_DEBUG_INFO := false" >> BoardConfig.mk; - echo "WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := true" >> BoardConfig.mk; - echo "Enabled core dexpreopt for $1"; + if true; then + echo "WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := false" >> BoardConfig.mk; + echo "Enabled full dexpreopt for $1"; + else + echo "WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := true" >> BoardConfig.mk; + echo "Enabled core dexpreopt for $1"; + fi; fi; cd "$DOS_BUILD_BASE"; } diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh index 8b9ae836..4f785648 100644 --- a/Scripts/LineageOS-17.1/Functions.sh +++ b/Scripts/LineageOS-17.1/Functions.sh @@ -114,8 +114,13 @@ enableDexPreOpt() { if [ -f BoardConfig.mk ]; then echo "WITH_DEXPREOPT := true" >> BoardConfig.mk; echo "WITH_DEXPREOPT_DEBUG_INFO := false" >> BoardConfig.mk; - echo "WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := true" >> BoardConfig.mk; - echo "Enabled core dexpreopt for $1"; + if true; then + echo "WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := false" >> BoardConfig.mk; + echo "Enabled full dexpreopt for $1"; + else + echo "WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := true" >> BoardConfig.mk; + echo "Enabled core dexpreopt for $1"; + fi; fi; cd "$DOS_BUILD_BASE"; } diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh index 2ed3bef9..704b82d4 100644 --- a/Scripts/LineageOS-17.1/Patch.sh +++ b/Scripts/LineageOS-17.1/Patch.sh @@ -229,7 +229,6 @@ echo "PRODUCT_PACKAGES += vendor.lineage.trust@1.0-service" >> packages.mk; #All # enterAndClear "device/cyanogen/msm8916-common"; awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #broken releasetools -sed -i -e '/mm-pp-d/,+4d' rootdir/etc/init.qcom.rc; enterAndClear "device/fairphone/FP3"; enableVerity; #Resurrect dm-verity @@ -245,19 +244,14 @@ enterAndClear "device/lge/mako"; echo "pmf=0" >> wifi/wpa_supplicant_overlay.conf; #Wi-Fi chipset doesn't support PMF awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfig.mk; #broken releasetools -enterAndClear "device/motorola/clark"; +#enterAndClear "device/motorola/clark"; #echo "TARGET_RECOVERY_PERMISSIVE_OVERRIDE := true" >> BoardConfig.mk; #Allow extract_firmware.sh to function -sed -i -e '/mm-pp-d/,+5d' rootdir/init.qcom.rc; - -enterAndClear "device/motorola/griffin"; -sed -i -e '/mm-pp-d/,+4d' rootdir/etc/init.qcom.rc; enterAndClear "device/oneplus/avicii"; enableVerity; #Resurrect dm-verity enterAndClear "device/oneplus/oneplus2"; sed -i 's|etc/permissions/qti_libpermissions.xml|vendor/etc/permissions/qti_libpermissions.xml|' proprietary-files.txt; -sed -i -e '/mm-pp-d/,+5d' rootdir/etc/init.qcom.rc; echo "allow mm-qcamerad camera_prop:file read;" >> sepolicy/mm-qcamerad.te; echo "set_prop(mm-qcamerad, camera_prop)" >> sepolicy/mm-qcamerad.te; diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh index b4f469e5..089aca77 100644 --- a/Scripts/LineageOS-18.1/Functions.sh +++ b/Scripts/LineageOS-18.1/Functions.sh @@ -126,8 +126,14 @@ enableDexPreOpt() { if [ -f BoardConfig.mk ]; then echo "WITH_DEXPREOPT := true" >> BoardConfig.mk; echo "WITH_DEXPREOPT_DEBUG_INFO := false" >> BoardConfig.mk; - echo "WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := true" >> BoardConfig.mk; - echo "Enabled core dexpreopt for $1"; + #m8: /system partition too small + if [ "$1" != "device/htc/m8" ] && [ "$1" != "device/samsung/jfltexx" ]; then + echo "WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := false" >> BoardConfig.mk; + echo "Enabled full dexpreopt for $1"; + else + echo "WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := true" >> BoardConfig.mk; + echo "Enabled core dexpreopt for $1"; + fi; fi; cd "$DOS_BUILD_BASE"; } diff --git a/Scripts/LineageOS-18.1/Patch.sh b/Scripts/LineageOS-18.1/Patch.sh index 22c197be..992c2c07 100644 --- a/Scripts/LineageOS-18.1/Patch.sh +++ b/Scripts/LineageOS-18.1/Patch.sh @@ -258,9 +258,6 @@ enterAndClear "device/moto/shamu"; git revert --no-edit 0ba2cb240e8483fa85fcc831328f70f65eeb7180 2be3c88c331387f03978b75ebc118e09738216d0 ff98fee8fc40d00e1c8b296fd4bb20077bc056d6; #breakage #git revert --no-edit 05fb49518049440f90423341ff25d4f75f10bc0c; #restore releasetools #TODO -enterAndClear "device/nextbit/ether"; -sed -i -e '/mm-pp-d/,+4d' rootdir/init.target.rc; - enterAndClear "device/oneplus/msm8998-common"; awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #disable releasetools to fix delta ota generation