From a9d90a06b9a808cc0eb3607428145b24a04f9421 Mon Sep 17 00:00:00 2001 From: Tad Date: Fri, 15 Jul 2022 11:03:41 -0400 Subject: [PATCH] Pick Signed-off-by: Tad --- Scripts/LineageOS-16.0/Functions.sh | 1 + Scripts/LineageOS-16.0/Patch.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index aeca9bd7..3da29907 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -82,6 +82,7 @@ patchWorkspace() { #repopick -it pie-firewall; repopick -it P_asb_2022-05; repopick -it P_asb_2022-06; + repopick -it P_asb_2022-07; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index 65e20462..94f21b36 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -98,7 +98,7 @@ sed -i '74i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aap if [ "$DOS_SILENCE_INCLUDED" = true ]; then sed -i 's/messaging/Silence/' target/product/aosp_base_telephony.mk target/product/treble_common.mk; fi; #Replace the Messaging app with Silence sed -i 's/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 17/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 28/' core/version_defaults.mk; #Set the minimum supported target SDK to Pie (GrapheneOS) awk -i inplace '!/Email/' target/product/core.mk; #Remove Email -sed -i 's/2022-01-05/2022-06-05/' core/version_defaults.mk; #Bump Security String #P_asb_2022-06 #XXX +sed -i 's/2022-01-05/2022-07-05/' core/version_defaults.mk; #Bump Security String #P_asb_2022-07 #XXX fi; if enterAndClear "build/soong"; then