From a81ed1c3409f9fce76ba74ee69d19a8bcfba50e6 Mon Sep 17 00:00:00 2001 From: Tavi Date: Mon, 18 Nov 2024 09:35:59 -0500 Subject: [PATCH] Churn Signed-off-by: Tavi --- Patches/Linux | 2 +- Scripts/LineageOS-20.0/Functions.sh | 3 +-- Scripts/LineageOS-20.0/Patch.sh | 4 ---- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index a1546504..98de6e36 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit a15465040e6638041e199ab8365298eeec7af437 +Subproject commit 98de6e366ffe11183191c2a54c1e5f1cae6dcdb3 diff --git a/Scripts/LineageOS-20.0/Functions.sh b/Scripts/LineageOS-20.0/Functions.sh index 88315a0e..41710cad 100644 --- a/Scripts/LineageOS-20.0/Functions.sh +++ b/Scripts/LineageOS-20.0/Functions.sh @@ -162,8 +162,7 @@ patchWorkspaceReal() { verifyAllPlatformTags; gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview"; - source build/envsetup.sh; - repopick -it T_asb_2024-11; + #source build/envsetup.sh; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-20.0/Patch.sh b/Scripts/LineageOS-20.0/Patch.sh index d24b6f4e..a3141ee8 100644 --- a/Scripts/LineageOS-20.0/Patch.sh +++ b/Scripts/LineageOS-20.0/Patch.sh @@ -125,10 +125,6 @@ sed -i 's/34359738368/2147483648/' Android.bp; #revert 48-bit address space requ sed -i -e '76,78d;' Android.bp; #fix compile under A13 fi; -if enterAndClear "external/skia"; then -git fetch https://github.com/LineageOS/android_external_skia refs/changes/23/408123/1 && git cherry-pick FETCH_HEAD; #T_asb_2024-11 Avoid potential overflow when allocating 3D mask from emboss filter -fi; - if enterAndClear "frameworks/base"; then git revert --no-edit d36faad3267522c6d3ff91ba9dcca8f6274bccd1; #Reverts "JobScheduler: Respect allow-in-power-save perm" in favor of below patch git revert --no-edit 90d6826548189ca850d91692e71fcc1be426f453; #Reverts "Remove sensitive info from SUPL requests" in favor of below patch