From d90bcb8ad32fc1fa58b3526ea1f0b18965e6975e Mon Sep 17 00:00:00 2001 From: Tad Date: Mon, 9 Oct 2023 16:42:50 -0400 Subject: [PATCH] Churn Signed-off-by: Tad --- Scripts/LineageOS-18.1/Functions.sh | 1 - Scripts/LineageOS-18.1/Patch.sh | 4 ---- Scripts/LineageOS-19.1/Functions.sh | 3 +-- Scripts/LineageOS-19.1/Patch.sh | 4 ---- Scripts/LineageOS-20.0/Functions.sh | 1 - Scripts/LineageOS-20.0/Patch.sh | 8 -------- 6 files changed, 1 insertion(+), 20 deletions(-) diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh index d77149e0..2946d65a 100644 --- a/Scripts/LineageOS-18.1/Functions.sh +++ b/Scripts/LineageOS-18.1/Functions.sh @@ -123,7 +123,6 @@ patchWorkspaceReal() { repopick -fit msm8974-gps-r; repopick -fit hh-vsync; repopick -fi 311299; #ble: Workaround malformed HCI_BLE_VENDOR_CAP response - repopick -it R_asb_2023-10; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-18.1/Patch.sh b/Scripts/LineageOS-18.1/Patch.sh index a61a5fc8..6d3f9ad6 100644 --- a/Scripts/LineageOS-18.1/Patch.sh +++ b/Scripts/LineageOS-18.1/Patch.sh @@ -123,10 +123,6 @@ applyPatch "$DOS_PATCHES/android_external_hardened_malloc/0001-Broken_Cameras.pa fi; fi; -if enterAndClear "external/libxml2"; then -git fetch https://github.com/LineageOS/android_external_libxml2 refs/changes/53/368053/1 && git cherry-pick FETCH_HEAD; #R_asb_2023-10 -fi; - if enterAndClear "frameworks/base"; then applyPatch "$DOS_PATCHES/android_frameworks_base/0007-Always_Restict_Serial.patch"; #Always restrict access to Build.SERIAL (GrapheneOS) applyPatch "$DOS_PATCHES/android_frameworks_base/0008-Browser_No_Location.patch"; #Don't grant location permission to system browsers (GrapheneOS) diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh index fc1e4d0f..7aa31864 100644 --- a/Scripts/LineageOS-19.1/Functions.sh +++ b/Scripts/LineageOS-19.1/Functions.sh @@ -85,10 +85,9 @@ patchWorkspaceReal() { verifyAllPlatformTags; gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview"; - source build/envsetup.sh; + #source build/envsetup.sh; #repopick -ift twelve-bt-sbc-hd-dualchannel; #repopick -it twelve-colors; - repopick -it S_asb_2023-10; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-19.1/Patch.sh b/Scripts/LineageOS-19.1/Patch.sh index 2015d5cf..72aa473b 100644 --- a/Scripts/LineageOS-19.1/Patch.sh +++ b/Scripts/LineageOS-19.1/Patch.sh @@ -121,10 +121,6 @@ applyPatch "$DOS_PATCHES/android_external_hardened_malloc/0001-Broken_Cameras-2. fi; fi; -if enterAndClear "external/libxml2"; then -git fetch https://github.com/LineageOS/android_external_libxml2 refs/changes/28/368028/1 && git cherry-pick FETCH_HEAD; #S_asb_2023-10 -fi; - if enterAndClear "external/SecureCamera"; then sed -i '/LOCAL_MODULE/s/Camera/SecureCamera/' Android.mk; #Change module name sed -i '11iLOCAL_OVERRIDES_PACKAGES := Camera Camera2 LegacyCamera Snap OpenCamera' Android.mk; #Replace the others diff --git a/Scripts/LineageOS-20.0/Functions.sh b/Scripts/LineageOS-20.0/Functions.sh index 197ad294..49344192 100644 --- a/Scripts/LineageOS-20.0/Functions.sh +++ b/Scripts/LineageOS-20.0/Functions.sh @@ -141,7 +141,6 @@ patchWorkspaceReal() { source build/envsetup.sh; repopick -i 361248; #Launcher3: Allow toggling monochrome icons for all apps - repopick -it T_asb_2023-10; 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 10972ea9..32a30eec 100644 --- a/Scripts/LineageOS-20.0/Patch.sh +++ b/Scripts/LineageOS-20.0/Patch.sh @@ -122,10 +122,6 @@ sed -i 's/34359738368/2147483648/' Android.bp; #revert 48-bit address space requ fi; fi; -if enterAndClear "external/libxml2"; then -git fetch https://github.com/LineageOS/android_external_libxml2 refs/changes/46/367946/1 && git cherry-pick FETCH_HEAD; #T_asb_2023-10 -fi; - if enterAndClear "frameworks/av"; then git am $DOS_PATCHES/ASB-2023-10/av-*.patch; fi; @@ -425,10 +421,6 @@ if enterAndClear "system/update_engine"; then git revert --no-edit ac104e8990f3be3a3f111241e9328e7f98bfb912; #Do not skip payload signature verification fi; -if enterAndClear "tools/apksig"; then -git fetch https://github.com/LineageOS/android_tools_apksig refs/changes/64/367964/1 && git cherry-pick FETCH_HEAD; #T_asb_2023-10 -fi; - if enterAndClear "vendor/lineage"; then rm build/target/product/security/lineage.x509.pem; #Remove Lineage keys rm -rf overlay/common/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml; #Remove analytics