From 4f4d760687d70409381e20df8dc7ce76299e0a94 Mon Sep 17 00:00:00 2001 From: Tavi Date: Thu, 21 Mar 2024 13:56:43 -0400 Subject: [PATCH] Churn Signed-off-by: Tavi --- PrebuiltApps | 2 +- Scripts/LineageOS-19.1/Functions.sh | 3 +-- Scripts/LineageOS-19.1/Patch.sh | 1 - Scripts/LineageOS-20.0/Functions.sh | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/PrebuiltApps b/PrebuiltApps index 41dd562a..aa7ac86d 160000 --- a/PrebuiltApps +++ b/PrebuiltApps @@ -1 +1 @@ -Subproject commit 41dd562aef34790ebff8c9e82eb7b16e4834b713 +Subproject commit aa7ac86d2d88ca34e2c4039354d26196d70730c8 diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh index 8d5b722b..b16c7438 100644 --- a/Scripts/LineageOS-19.1/Functions.sh +++ b/Scripts/LineageOS-19.1/Functions.sh @@ -66,10 +66,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_2024-03; 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 2f06d9fc..1c131fca 100644 --- a/Scripts/LineageOS-19.1/Patch.sh +++ b/Scripts/LineageOS-19.1/Patch.sh @@ -98,7 +98,6 @@ sed -i '75i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aap awk -i inplace '!/updatable_apex.mk/' target/product/generic_system.mk; #Disable APEX sed -i 's/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 23/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 28/' core/version_defaults.mk; #Set the minimum supported target SDK to Pie (GrapheneOS) #sed -i 's/PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := true/PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false/' core/product_config.mk; #broken by hardenDefconfig -sed -i 's/2024-01-05/2024-02-05/' core/version_defaults.mk; #Bump Security String #S_asb_2024-02 fi; if enterAndClear "build/soong"; then diff --git a/Scripts/LineageOS-20.0/Functions.sh b/Scripts/LineageOS-20.0/Functions.sh index fecae042..c0629749 100644 --- a/Scripts/LineageOS-20.0/Functions.sh +++ b/Scripts/LineageOS-20.0/Functions.sh @@ -161,7 +161,6 @@ patchWorkspaceReal() { source build/envsetup.sh; repopick -i 361248; #Launcher3: Allow toggling monochrome icons for all apps - repopick -it T_asb_2024-03; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";