From 933f33ba6ba940ba9a4345f7346de23ba1626489 Mon Sep 17 00:00:00 2001 From: Tad Date: Thu, 4 Aug 2022 09:57:11 -0400 Subject: [PATCH] Cherrypicks Signed-off-by: Tad --- Scripts/LineageOS-17.1/Functions.sh | 3 ++- Scripts/LineageOS-18.1/Functions.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh index f6827d3c..8a160812 100644 --- a/Scripts/LineageOS-17.1/Functions.sh +++ b/Scripts/LineageOS-17.1/Functions.sh @@ -84,8 +84,9 @@ patchWorkspace() { touch DOS_PATCHED_FLAG; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; - #source build/envsetup.sh; + source build/envsetup.sh; #repopick -it ten-firewall; + repopick -it Q_asb_2022-08; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh index f57e59a2..a86ad3cc 100644 --- a/Scripts/LineageOS-18.1/Functions.sh +++ b/Scripts/LineageOS-18.1/Functions.sh @@ -125,11 +125,12 @@ patchWorkspace() { touch DOS_PATCHED_FLAG; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; - #source build/envsetup.sh; + source build/envsetup.sh; #repopick -it eleven-firewall; #repopick -i 314130; #adbconnection: don't spin if adbd isn't running #repopick -i 314453; #TaskViewTouchController: Null check current animation on drag #repopick -i 325011; #lineage: Opt-in to shipping full recovery image by default + repopick -it R_asb_2022-08; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";