From 97dc687812237c9e17c776b812df2a24df8b48c1 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Fri, 15 Mar 2019 22:13:32 -0400
Subject: [PATCH] Update cherry picks

---
 Scripts/LineageOS-11.0/Functions.sh | 2 +-
 Scripts/LineageOS-14.1/Functions.sh | 2 --
 Scripts/LineageOS-16.0/Functions.sh | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Scripts/LineageOS-11.0/Functions.sh b/Scripts/LineageOS-11.0/Functions.sh
index 2ee8a13d..d295db85 100644
--- a/Scripts/LineageOS-11.0/Functions.sh
+++ b/Scripts/LineageOS-11.0/Functions.sh
@@ -58,9 +58,9 @@ patchWorkspace() {
 	sed -i "s/'git', 'show', '-q'/'git', 'show'/" build/tools/repopick.py; #fix for old git versions
 	source build/envsetup.sh;
 	repopick -it asb-2018.09-cm11-qcom;
-	repopick -it cm.service.adb.root; #security fix for -userdebug
 	repopick -it asb-2019.02-cm11;
 	repopick -it asb-2019.03-cm11;
+	repopick -it 230054 230392; #asb disclaimer
 
 	source "$DOS_SCRIPTS/Patch.sh";
 	source "$DOS_SCRIPTS/Defaults.sh";
diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh
index adce9cce..c359ee63 100644
--- a/Scripts/LineageOS-14.1/Functions.sh
+++ b/Scripts/LineageOS-14.1/Functions.sh
@@ -98,8 +98,6 @@ patchWorkspace() {
 	if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/cm"; fi;
 	source build/envsetup.sh;
 	repopick -it n_asb_09-2018-qcom;
-	repopick -i 243457;
-	repopick -it asb-2019.03-cm14;
 
 	source "$DOS_SCRIPTS/Patch.sh";
 	source "$DOS_SCRIPTS/Defaults.sh";
diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh
index 0e3afb34..494bc062 100644
--- a/Scripts/LineageOS-16.0/Functions.sh
+++ b/Scripts/LineageOS-16.0/Functions.sh
@@ -61,7 +61,6 @@ patchWorkspace() {
 
 	source build/envsetup.sh;
 	repopick 244148; #log spam fix
-	repopick 244166; #build fix
 
 	source "$DOS_SCRIPTS/Patch.sh";
 	source "$DOS_SCRIPTS/Defaults.sh";