Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-12-26 16:09:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Reverts + disable mm-pp removal

Browse Source 
Revert d7fd127e5f
Partial revert 1c9a66f896
This commit is contained in:
Tad 2021-05-30 01:55:29 -04:00
parent d7fd127e5f
commit 5c3d3b4d35
8 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Scripts/Common/Deblob.sh
View File

@ -125,10 +125,10 @@ echo "Deblobbing...";
makes=$makes"|DxHDCP.cfg"; makes=$makes"|DxHDCP.cfg";
#Display Color Tuning [Qualcomm] #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"|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"|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"|vendor.display.color.*|vendor.display.postproc.*|vendor.qti.hardware.qdutils_disp.*|com.qti.snapdragon.sdk.display.*";
#DivX (DRM) [DivX] #DivX (DRM) [DivX]
blobs=$blobs"|libDivxDrm.so|libSHIMDivxDrm.so"; 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 -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 rm -rf IMSEnabler; #Remove IMS compatibility module
fi; 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 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 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 rm -rf libshimwvm libshims/wvm_shim.cpp; #Remove Google Widevine compatibility module

9
Scripts/LineageOS-15.1/Functions.sh
View File

@ -101,8 +101,13 @@ enableDexPreOpt() {
echo "WITH_DEXPREOPT := true" >> BoardConfig.mk; echo "WITH_DEXPREOPT := true" >> BoardConfig.mk;
echo "WITH_DEXPREOPT_DEBUG_INFO := false" >> BoardConfig.mk; echo "WITH_DEXPREOPT_DEBUG_INFO := false" >> BoardConfig.mk;
echo "WITH_DEXPREOPT_PIC := true" >> BoardConfig.mk; echo "WITH_DEXPREOPT_PIC := true" >> BoardConfig.mk;
echo "WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := true" >> BoardConfig.mk; if true; then
echo "Enabled core dexpreopt for $1"; 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; fi;
cd "$DOS_BUILD_BASE"; cd "$DOS_BUILD_BASE";
} }

10
Scripts/LineageOS-15.1/Patch.sh
View File

@ -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"; enterAndClear "device/asus/msm8916-common";
rm -rf Android.bp sensors; #exact duplicate in asus/flo #XXX be careful with this 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"; enterAndClear "device/lge/msm8996-common";
sed -i '3itypeattribute hwaddrs misc_block_device_exception;' sepolicy/hwaddrs.te; sed -i '3itypeattribute hwaddrs misc_block_device_exception;' sepolicy/hwaddrs.te;
enterAndClear "device/oneplus/oneplus2"; 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 '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"; #enterAndClear "device/moto/shamu";
#git revert --no-edit 05fb49518049440f90423341ff25d4f75f10bc0c; #restore releasetools #TODO #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 #Make changes to all devices
cd "$DOS_BUILD_BASE"; 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; 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;

9
Scripts/LineageOS-16.0/Functions.sh
View File

@ -92,8 +92,13 @@ enableDexPreOpt() {
if [ -f BoardConfig.mk ]; then if [ -f BoardConfig.mk ]; then
echo "WITH_DEXPREOPT := true" >> BoardConfig.mk; echo "WITH_DEXPREOPT := true" >> BoardConfig.mk;
echo "WITH_DEXPREOPT_DEBUG_INFO := false" >> BoardConfig.mk; echo "WITH_DEXPREOPT_DEBUG_INFO := false" >> BoardConfig.mk;
echo "WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := true" >> BoardConfig.mk; if true; then
echo "Enabled core dexpreopt for $1"; 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; fi;
cd "$DOS_BUILD_BASE"; cd "$DOS_BUILD_BASE";
} }

9
Scripts/LineageOS-17.1/Functions.sh
View File

@ -114,8 +114,13 @@ enableDexPreOpt() {
if [ -f BoardConfig.mk ]; then if [ -f BoardConfig.mk ]; then
echo "WITH_DEXPREOPT := true" >> BoardConfig.mk; echo "WITH_DEXPREOPT := true" >> BoardConfig.mk;
echo "WITH_DEXPREOPT_DEBUG_INFO := false" >> BoardConfig.mk; echo "WITH_DEXPREOPT_DEBUG_INFO := false" >> BoardConfig.mk;
echo "WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := true" >> BoardConfig.mk; if true; then
echo "Enabled core dexpreopt for $1"; 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; fi;
cd "$DOS_BUILD_BASE"; cd "$DOS_BUILD_BASE";
} }

8
Scripts/LineageOS-17.1/Patch.sh
View File

@ -229,7 +229,6 @@ echo "PRODUCT_PACKAGES += vendor.lineage.trust@1.0-service" >> packages.mk; #All
# #
enterAndClear "device/cyanogen/msm8916-common"; enterAndClear "device/cyanogen/msm8916-common";
awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #broken releasetools 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"; enterAndClear "device/fairphone/FP3";
enableVerity; #Resurrect dm-verity 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 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 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 #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"; enterAndClear "device/oneplus/avicii";
enableVerity; #Resurrect dm-verity enableVerity; #Resurrect dm-verity
enterAndClear "device/oneplus/oneplus2"; enterAndClear "device/oneplus/oneplus2";
sed -i 's|etc/permissions/qti_libpermissions.xml|vendor/etc/permissions/qti_libpermissions.xml|' proprietary-files.txt; 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 "allow mm-qcamerad camera_prop:file read;" >> sepolicy/mm-qcamerad.te;
echo "set_prop(mm-qcamerad, camera_prop)" >> sepolicy/mm-qcamerad.te; echo "set_prop(mm-qcamerad, camera_prop)" >> sepolicy/mm-qcamerad.te;

10
Scripts/LineageOS-18.1/Functions.sh
View File

@ -126,8 +126,14 @@ enableDexPreOpt() {
if [ -f BoardConfig.mk ]; then if [ -f BoardConfig.mk ]; then
echo "WITH_DEXPREOPT := true" >> BoardConfig.mk; echo "WITH_DEXPREOPT := true" >> BoardConfig.mk;
echo "WITH_DEXPREOPT_DEBUG_INFO := false" >> BoardConfig.mk; echo "WITH_DEXPREOPT_DEBUG_INFO := false" >> BoardConfig.mk;
echo "WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := true" >> BoardConfig.mk; #m8: /system partition too small
echo "Enabled core dexpreopt for $1"; 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; fi;
cd "$DOS_BUILD_BASE"; cd "$DOS_BUILD_BASE";
} }

3
Scripts/LineageOS-18.1/Patch.sh
View File

@ -258,9 +258,6 @@ enterAndClear "device/moto/shamu";
git revert --no-edit 0ba2cb240e8483fa85fcc831328f70f65eeb7180 2be3c88c331387f03978b75ebc118e09738216d0 ff98fee8fc40d00e1c8b296fd4bb20077bc056d6; #breakage git revert --no-edit 0ba2cb240e8483fa85fcc831328f70f65eeb7180 2be3c88c331387f03978b75ebc118e09738216d0 ff98fee8fc40d00e1c8b296fd4bb20077bc056d6; #breakage
#git revert --no-edit 05fb49518049440f90423341ff25d4f75f10bc0c; #restore releasetools #TODO #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"; enterAndClear "device/oneplus/msm8998-common";
awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #disable releasetools to fix delta ota generation awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #disable releasetools to fix delta ota generation