From 5d14e4b4f7ec1b2f4417a3b96e6ce6eb302ecc4d Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Wed, 24 Mar 2021 00:57:59 -0400
Subject: [PATCH] Small changes

- Add m7 and avicii (untested)
- Use low_ram target on <2GB devices
  Silly me, this never did anything due to the git reset...
- Update Chromium WebView cherrypick
---
 Manifests/Manifest_LAOS-14.1.xml              |   6 +
 Manifests/Manifest_LAOS-17.1.xml              |   4 +
 .../build/target/product/lowram.mk            |  21 +-
 .../0002-Perf_Tweaks.patch                    |   7 +-
 .../0001-External_Permission.patch            |  28 ++
 Scripts/Common/Copy_Keys.sh                   |   2 +
 Scripts/Common/Fix_CVE_Patchers.sh            |   1 +
 .../android_kernel_htc_msm8960.sh             | 284 ++++++++++++++++++
 Scripts/LineageOS-14.1/Functions.sh           |   7 +-
 Scripts/LineageOS-14.1/Patch.sh               |  15 +-
 Scripts/LineageOS-15.1/Functions.sh           |   3 +-
 Scripts/LineageOS-15.1/Patch.sh               |   5 +-
 Scripts/LineageOS-16.0/Functions.sh           |   3 +-
 Scripts/LineageOS-16.0/Patch.sh               |   2 +-
 .../android_kernel_oneplus_sm7250.sh          | 256 ++++++++++++++++
 .../android_kernel_samsung_universal9810.sh   | 199 ------------
 Scripts/LineageOS-17.1/Functions.sh           |   7 +-
 Scripts/LineageOS-17.1/Patch.sh               |   5 +-
 Scripts/LineageOS-18.1/Functions.sh           |   3 +-
 Scripts/LineageOS-18.1/Patch.sh               |   2 +-
 20 files changed, 631 insertions(+), 229 deletions(-)
 create mode 100644 Patches/LineageOS-15.1/android_packages_providers_MediaProvider/0001-External_Permission.patch
 create mode 100644 Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8960.sh
 create mode 100644 Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh
 delete mode 100644 Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_universal9810.sh

diff --git a/Manifests/Manifest_LAOS-14.1.xml b/Manifests/Manifest_LAOS-14.1.xml
index 62322308..5ccf4cff 100644
--- a/Manifests/Manifest_LAOS-14.1.xml
+++ b/Manifests/Manifest_LAOS-14.1.xml
@@ -83,6 +83,12 @@
 	<project path="device/asus/Z00T" name="LineageOS/android_device_asus_Z00T" remote="github" />
 	<project path="kernel/asus/msm8916" name="LineageOS/android_kernel_asus_msm8916" remote="github" />
 
+	<!-- HTC One (m7) -->
+	<project path="device/htc/m7" name="LineageOS/android_device_htc_m7" remote="github" />
+	<project path="device/htc/m7-common" name="LineageOS/android_device_htc_m7-common" remote="github" />
+	<project path="device/htc/msm8960-common" name="LineageOS/android_device_htc_msm8960-common" remote="github" />
+	<project path="kernel/htc/msm8960" name="LineageOS/android_kernel_htc_msm8960" remote="github" />
+
 	<!-- HTC One (m9) -->
 	<project path="device/htc/himaul" name="LineageOS/android_device_htc_himaul" remote="github" />
 	<project path="device/htc/hima-common" name="LineageOS/android_device_htc_hima-common" remote="github" />
diff --git a/Manifests/Manifest_LAOS-17.1.xml b/Manifests/Manifest_LAOS-17.1.xml
index 4ce3196b..8263edbc 100644
--- a/Manifests/Manifest_LAOS-17.1.xml
+++ b/Manifests/Manifest_LAOS-17.1.xml
@@ -230,6 +230,10 @@
 	<project path="device/oneplus/guacamole" name="LineageOS/android_device_oneplus_guacamole" remote="github" />
 	<project path="kernel/oneplus/sm8150" name="LineageOS/android_kernel_oneplus_sm8150" remote="github" />
 
+	<!-- OnePlus Nord (avicii) -->
+	<project path="device/oneplus/avicii" name="LineageOS/android_device_oneplus_avicii" remote="github" />
+	<project path="kernel/oneplus/sm7250" name="LineageOS/android_kernel_oneplus_sm7250" remote="github" />
+
 	<!-- Razer Phone (cheryl) -->
 	<project path="device/razer/cheryl" name="LineageOS/android_device_razer_cheryl" remote="github" />
 	<project path="kernel/razer/msm8998" name="LineageOS/android_kernel_razer_msm8998" remote="github" />
diff --git a/Patches/Common/android_vendor_divested/build/target/product/lowram.mk b/Patches/Common/android_vendor_divested/build/target/product/lowram.mk
index 94341baa..9b5d085e 100644
--- a/Patches/Common/android_vendor_divested/build/target/product/lowram.mk
+++ b/Patches/Common/android_vendor_divested/build/target/product/lowram.mk
@@ -14,19 +14,20 @@
 # limitations under the License.
 #
 
-# Changes various properties to reduce memory usage even on devices with 1GB+ RAM
+# Changes various properties to reduce memory usage
 
 # Set lowram options
 PRODUCT_PROPERTY_OVERRIDES += \
      ro.config.low_ram=true \
      ro.lmk.critical_upgrade=true \
      ro.lmk.upgrade_pressure=40 \
+     ro.lmk.downgrade_pressure=60 \
+     ro.lmk.kill_heaviest_task=false \
      config.disable_atlas=true \
-     persist.sys.use_16bpp_alpha=1
-
-# set threshold to filter unused apps
-PRODUCT_PROPERTY_OVERRIDES += \
-     pm.dexopt.downgrade_after_inactive_days=14
+     persist.sys.use_16bpp_alpha=1 \
+     dalvik.vm.madvise-random=true
+#     dalvik.vm.heapgrowthlimit=128m \
+#     dalvik.vm.heapsize=256m
 
 # Speed profile services and wifi-service to reduce RAM and storage.
 PRODUCT_SYSTEM_SERVER_COMPILER_FILTER := speed-profile
@@ -34,3 +35,11 @@ PRODUCT_SYSTEM_SERVER_COMPILER_FILTER := speed-profile
 # Always preopt extracted APKs to prevent extracting out of the APK for gms
 # modules.
 PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK := true
+
+# Do not generate libartd.
+PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD := false
+
+# Strip the local variable table and the local variable type table to reduce
+# the size of the system image. This has no bearing on stack traces, but will
+# leave less information available via JDWP.
+PRODUCT_MINIMIZE_JAVA_DEBUG_INFO := true
diff --git a/Patches/LineageOS-14.1/android_device_asus_grouper/0002-Perf_Tweaks.patch b/Patches/LineageOS-14.1/android_device_asus_grouper/0002-Perf_Tweaks.patch
index bfaad15b..b49966fb 100644
--- a/Patches/LineageOS-14.1/android_device_asus_grouper/0002-Perf_Tweaks.patch
+++ b/Patches/LineageOS-14.1/android_device_asus_grouper/0002-Perf_Tweaks.patch
@@ -26,7 +26,6 @@ index f402c86..c84be43 100644
  
  # Filesystem
 diff --git a/device.mk b/device.mk
-index 33c1fc9..8d8c65a 100644
 --- a/device.mk
 +++ b/device.mk
 @@ -24,7 +24,8 @@ PRODUCT_COPY_FILES += \
@@ -40,7 +39,6 @@ index 33c1fc9..8d8c65a 100644
  DEVICE_PACKAGE_OVERLAYS += \
      device/asus/grouper/overlay
 diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
-index d28e4fb..c9ec73a 100644
 --- a/overlay/frameworks/base/core/res/res/values/config.xml
 +++ b/overlay/frameworks/base/core/res/res/values/config.xml
 @@ -219,4 +219,11 @@
@@ -56,10 +54,9 @@ index d28e4fb..c9ec73a 100644
 +
  </resources>
 diff --git a/system.prop b/system.prop
-index b1d9807..1f31c09 100644
 --- a/system.prop
 +++ b/system.prop
-@@ -12,6 +12,29 @@ ro.sf.lcd_density=213
+@@ -12,6 +12,27 @@ ro.sf.lcd_density=213
  # Wi-Fi
  wifi.interface=wlan0
  
@@ -78,8 +75,6 @@ index b1d9807..1f31c09 100644
 +dalvik.vm.dex2oat-flags=--no-watch-dog
 +dalvik.vm.dex2oat-swap=true
 +debug.hwui.render_dirty_regions=false
-+persist.debug.wfd.enable=1
-+persist.sys.force_highendgfx=true
 +persist.sys.scrollingcache=1
 +persist.sys.use_16bpp_alpha=1
 +pm.sleep_mode=1
diff --git a/Patches/LineageOS-15.1/android_packages_providers_MediaProvider/0001-External_Permission.patch b/Patches/LineageOS-15.1/android_packages_providers_MediaProvider/0001-External_Permission.patch
new file mode 100644
index 00000000..1c31658d
--- /dev/null
+++ b/Patches/LineageOS-15.1/android_packages_providers_MediaProvider/0001-External_Permission.patch
@@ -0,0 +1,28 @@
+From 3f038f4a5e81a78f286f5557066af271683fadbc Mon Sep 17 00:00:00 2001
+From: Luca Stefani <luca.stefani.ge1@gmail.com>
+Date: Thu, 24 Nov 2016 13:31:24 +0100
+Subject: [PATCH] MediaProvider: Add read storage permission
+
+* Fixes:
+Permission Denial: reading com.android.providers.media.MediaProvider uri content://media/external/fs_id
+
+Change-Id: Id4dd5e287c1162f4c8b7fbb2411b834fe98f2516
+---
+ AndroidManifest.xml | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/AndroidManifest.xml b/AndroidManifest.xml
+index 05e6d77..2e33a3a 100644
+--- a/AndroidManifest.xml
++++ b/AndroidManifest.xml
+@@ -13,6 +13,7 @@
+     <uses-permission android:name="android.permission.ACCESS_MTP" />
+     <uses-permission android:name="android.permission.MANAGE_USERS" />
+     <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
++    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+ 
+     <application android:process="android.process.media"
+                  android:label="@string/app_label"
+-- 
+2.30.2
+
diff --git a/Scripts/Common/Copy_Keys.sh b/Scripts/Common/Copy_Keys.sh
index a80b3128..d1a38a8f 100644
--- a/Scripts/Common/Copy_Keys.sh
+++ b/Scripts/Common/Copy_Keys.sh
@@ -17,6 +17,7 @@
 
 echo "Copying verity/avb public keys to kernels...";
 cat "$DOS_SIGNING_KEYS/Amber/verity.x509.pem" >> "kernel/yandex/sdm660/certs/verity.x509.pem";
+cat "$DOS_SIGNING_KEYS/avicii/verity.x509.pem" >> "kernel/oneplus/sm7250/certs/verity.x509.pem";
 cat "$DOS_SIGNING_KEYS/beryllium/verity.x509.pem" >> "kernel/xiaomi/sdm845/certs/verity.x509.pem";
 cat "$DOS_SIGNING_KEYS/blueline/verity.x509.pem" >> "kernel/google/crosshatch/certs/verity.x509.pem";
 cat "$DOS_SIGNING_KEYS/blueline/verity.x509.pem" >> "kernel/google/msm-4.9/certs/verity.x509.pem";
@@ -44,6 +45,7 @@ cat "$DOS_SIGNING_KEYS/taimen/verity.x509.pem" >> "kernel/google/wahoo/certs/ver
 cat "$DOS_SIGNING_KEYS/walleye/verity.x509.pem" >> "kernel/google/wahoo/certs/verity.x509.pem";
 cat "$DOS_SIGNING_KEYS/z2_plus/verity.x509.pem" >> "kernel/zuk/msm8996/certs/verity.x509.pem";
 cp -v "$DOS_SIGNING_KEYS/Amber/verifiedboot_relkeys.der.x509" "kernel/yandex/sdm660/verifiedboot_Amber_dos_relkeys.der.x509";
+cp -v "$DOS_SIGNING_KEYS/avicii/verifiedboot_relkeys.der.x509" "kernel/oneplus/sm7250/verifiedboot_avicii_dos_relkeys.der.x509";
 cp -v "$DOS_SIGNING_KEYS/beryllium/verifiedboot_relkeys.der.x509" "kernel/xiaomi/sdm845/verifiedboot_beryllium_dos_relkeys.der.x509";
 cp -v "$DOS_SIGNING_KEYS/blueline/verifiedboot_relkeys.der.x509" "kernel/google/crosshatch/verifiedboot_blueline_dos_relkeys.der.x509";
 cp -v "$DOS_SIGNING_KEYS/blueline/verifiedboot_relkeys.der.x509" "kernel/google/msm-4.9/verifiedboot_blueline_dos_relkeys.der.x509";
diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh
index e6665c6e..94d93668 100644
--- a/Scripts/Common/Fix_CVE_Patchers.sh
+++ b/Scripts/Common/Fix_CVE_Patchers.sh
@@ -49,6 +49,7 @@ commentPatches android_kernel_google_wahoo.sh "CVE-2019-14047/ANY/0002.patch" "C
 commentPatches android_kernel_google_yellowstone.sh "0001-LinuxIncrementals/3.10/3.10.0098-0099.patch" "CVE-2018-9514";
 commentPatches android_kernel_huawei_angler.sh "CVE-2014-8559";
 commentPatches android_kernel_htc_flounder.sh "CVE-2018-9514";
+commentPatches android_kernel_htc_msm8960.sh "CVE-2018-10876";
 commentPatches android_kernel_htc_msm8994.sh "CVE-2016-8394/ANY/0001.patch" "CVE-2017-13166" "CVE-2018-3585" "CVE-2018-9514";
 commentPatches android_kernel_lge_bullhead.sh "CVE-2014-8559";
 commentPatches android_kernel_lge_msm8992.sh "CVE-2018-5897" "CVE-2018-11266";
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8960.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8960.sh
new file mode 100644
index 00000000..5b0ffd05
--- /dev/null
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8960.sh
@@ -0,0 +1,284 @@
+#!/bin/bash
+cd "$DOS_BUILD_BASE""kernel/htc/msm8960"
+git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/0005-AndroidHardening-Deny_USB/3.4/3.4-Backport.patch
+git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6544/3.4/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6544/3.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6544/3.4/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6544/^3.6/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6545/3.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6545/3.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6545/3.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-0349/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-1957/^3.9/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-1957/^3.9/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3076/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3222/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3224/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3225/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3227/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3228/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2042/^3.19/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-6640/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-6937/3.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7566/^4.4.1/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0801/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0806/prima/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2185/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2186/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2187/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3136/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3137/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3841/3.4/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3854/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3865/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3894/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4485/^4.5.5/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4580/^4.5.5/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4913/^4.5.5/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5244/^4.6.3/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5828/^4.6.3/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6480/^4.7/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6672/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-7117/^4.5.2/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8402/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8404/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8650/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9576/3.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10318/^4.7.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0457/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0524/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0751/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0786/ANY/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0861/ANY/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7308/3.4/0021.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7308/3.4/0022.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7487/^4.11.1/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7533/3.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7645/^4.10.11/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8246/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8246/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8254/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8254/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8824/^4.14.3/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9984/^4.11.7/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10662/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10663/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11015/prima/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11015/prima/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11089/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11090/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11176/^4.11.9/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11473/^4.12.2/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-12153/^4.13.3/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-12762/^4.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13080/3.4/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/^4.4/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13215/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13216/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13245/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13246/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13305/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13695/^4.12.9/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14106/^4.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14489/^4.13.2/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15115/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15649/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15850/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15868/3.4/0012.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15868/3.4/0013.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15868/3.4/0014.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16525/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16526/^4.13.6/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16531/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16532/^4.13.11/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16533/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16534/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16535/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16537/^4.13.11/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16643/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/^4.13.11/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16939/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17450/^4.14.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17558/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17770/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17805/^4.14.8/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17806/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17807/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18079/^4.12.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18203/^4.14.3/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18360/^4.11.3/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000111/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000251/3.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000363/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000365/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000380/^4.11.5/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/^4.16/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3561/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3584/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5332/^4.14.13/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5333/^4.14.13/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5344/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5750/^4.14.15/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5803/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-6927/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7492/^4.14.7/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7566/^4.15/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7755/^4.15.7/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7757/^4.15.7/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8781/^4.15/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9389/3.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9416/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9422/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9516/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9517/3.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9517/3.4/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9517/3.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9517/3.4/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9517/3.4/0010.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9568/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10021/^4.16/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/^4.13/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/^4.13/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/^4.12.9/0001.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0003.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0004.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0005.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0006.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0007.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0008.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0009.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0010.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10882/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10940/^4.16.6/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11832/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11939/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-12233/^4.17.1/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13053/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13099/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13405/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13917/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14614/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14634/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-15594/^4.18.1/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16658/^4.18.6/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18710/^4.19/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-19985/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20169/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20511/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1000199/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1000199/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1000204/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2001/^3.10/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2331/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3460/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-5489/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-5489/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9454/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9456/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9456/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10142/^5.0.17/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10607/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11477/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11478/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11884/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14821/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15117/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15118/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15213/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15214/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15216/^5.0.14/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15239/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15505/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15807/^5.1.13/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15926/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17133/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-18806/^5.3.5/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19066/^5.3.11/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19073/^5.3.11/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19074/^5.3.11/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19524/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19527/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19527/3.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19528/^5.3.7/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19528/^5.3.7/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19532/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19537/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0040/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8648/3.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8648/3.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8648/3.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10773/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/^5.6.2/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12656/^5.6.10/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25669/^5.7/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/^3.15/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch
+git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
+editKernelLocalversion "-dos.p280"
+cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh
index 3403abc9..c1e53a43 100644
--- a/Scripts/LineageOS-14.1/Functions.sh
+++ b/Scripts/LineageOS-14.1/Functions.sh
@@ -18,7 +18,7 @@
 #Last verified: 2018-04-27
 
 patchAllKernels() {
-	startPatcher "kernel_amazon_hdx-common kernel_asus_grouper kernel_asus_msm8916 kernel_htc_msm8994 kernel_lge_msm8992 kernel_motorola_msm8916 kernel_motorola_msm8992 kernel_samsung_exynos5420 kernel_samsung_manta kernel_samsung_smdk4412 kernel_samsung_tuna kernel_samsung_universal8890 kernel_zte_msm8996";
+	startPatcher "kernel_amazon_hdx-common kernel_asus_grouper kernel_asus_msm8916 kernel_htc_msm8960 kernel_htc_msm8994 kernel_lge_msm8992 kernel_motorola_msm8916 kernel_motorola_msm8992 kernel_samsung_exynos5420 kernel_samsung_manta kernel_samsung_smdk4412 kernel_samsung_tuna kernel_samsung_universal8890 kernel_zte_msm8996";
 }
 export -f patchAllKernels;
 
@@ -60,6 +60,8 @@ buildAll() {
 	if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanWorkspaceForMalware; fi;
 	if [ "$DOS_OPTIMIZE_IMAGES" = true ]; then optimizeImagesRecursive "$DOS_BUILD_BASE"; fi;
 	#Select devices are userdebug due to SELinux policy issues
+	#SD600
+	buildDeviceUserDebug m7;
 	#SD801
 	buildDeviceUserDebug thor; #broken encryption
 	#SD808
@@ -88,6 +90,7 @@ buildAll() {
 	buildDevice toroplus;
 	#Tegra
 	buildDevice grouper; #needs manual patching - one-repo vendor blob patch
+
 }
 export -f buildAll;
 
@@ -141,7 +144,7 @@ export -f enableDexPreOptFull;
 
 enableLowRam() {
 	cd "$DOS_BUILD_BASE$1";
-	if [ -f lineage.mk ]; then echo '$(call inherit-product, vendor/divested/build/target/product/lowram.mk)' >> lineage.mk; fi;
+	if [ -f lineage.mk ]; then echo -e '\n$(call inherit-product, vendor/divested/build/target/product/lowram.mk)' >> lineage.mk; fi;
 	if [ -f BoardConfig.mk ]; then echo 'MALLOC_SVELTE := true' >> BoardConfig.mk; fi;
 	if [ -f BoardConfigCommon.mk ]; then echo 'MALLOC_SVELTE := true' >> BoardConfigCommon.mk; fi;
 	echo "Enabled lowram for $1";
diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh
index f74fdeda..45d50da8 100644
--- a/Scripts/LineageOS-14.1/Patch.sh
+++ b/Scripts/LineageOS-14.1/Patch.sh
@@ -75,7 +75,7 @@ patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/248649.patch"; #msm_irqba
 patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/0001-Camera_Fix.patch"; #Fix camera on user builds XXX: REMOVE THIS TRASH
 
 enterAndClear "external/chromium-webview";
-git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/88/305088/2 #update webview
+git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/88/305088/3; #update webview
 
 enterAndClear "external/sqlite";
 patch -p1 < "$DOS_PATCHES/android_external_sqlite/0001-Secure_Delete.patch"; #Enable secure_delete by default (AndroidHardening-13.0)
@@ -248,7 +248,6 @@ sed -i 's/,encryptable=footer//' rootdir/etc/fstab.qcom; #Using footer will brea
 #XXX: If not used with a supported recovery, it'll be thrown into a bootloop, don't worry just 'fastboot erase misc' and reboot
 #echo "/dev/block/platform/msm_sdcc.1/by-name/misc /misc emmc defaults defaults" >> rootdir/etc/fstab.qcom; #Add the misc (mmcblk0p5) partition for recovery flags
 
-enableLowRam "device/asus/grouper";
 enterAndClear "device/asus/grouper";
 patch -p1 < "$DOS_PATCHES/android_device_asus_grouper/0001-Update_Blobs.patch";
 patch -p1 < "$DOS_PATCHES/android_device_asus_grouper/0002-Perf_Tweaks.patch";
@@ -272,7 +271,6 @@ awk -i inplace '!/shell su/' sepolicy/shell.te; #neverallow
 enterAndClear "device/samsung/toroplus";
 awk -i inplace '!/additional_system_update/' overlay/packages/apps/Settings/res/values*/*.xml;
 
-enableLowRam "device/samsung/tuna";
 enterAndClear "device/samsung/tuna";
 #git revert --no-edit e53eea6426da49dfb542929d5aa686667f4d416f; #restore releasetools #TODO
 rm setup-makefiles.sh; #broken, deblobber will still function
@@ -304,6 +302,17 @@ cd "$DOS_BUILD_BASE";
 deblobAudio;
 removeBuildFingerprints;
 
+#Tweaks for <2GB RAM devices
+enableLowRam "device/asus/grouper";
+enableLowRam "device/motorola/osprey";
+enableLowRam "device/samsung/i9100";
+enableLowRam "device/samsung/i9300";
+enableLowRam "device/samsung/i9305";
+enableLowRam "device/samsung/maguro";
+enableLowRam "device/samsung/manta";
+enableLowRam "device/samsung/toro";
+enableLowRam "device/samsung/toroplus";
+
 #Fixes
 #Fix broken options enabled by hardenDefconfig()
 sed -i "s/# CONFIG_KPROBES is not set/CONFIG_KPROBES=y/" kernel/amazon/hdx-common/arch/arm/configs/*hdx*_defconfig; #Breaks on compile
diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh
index c1a0ead2..6be6cea6 100644
--- a/Scripts/LineageOS-15.1/Functions.sh
+++ b/Scripts/LineageOS-15.1/Functions.sh
@@ -120,8 +120,7 @@ export -f enableDexPreOpt;
 
 enableLowRam() {
 	cd "$DOS_BUILD_BASE$1";
-	#if [ -f lineage.mk ]; then echo '$(call inherit-product, $(SRC_TARGET_DIR)/product/go_defaults.mk)' >> lineage.mk; fi;
-	if [ -f lineage.mk ]; then echo '$(call inherit-product, vendor/divested/build/target/product/lowram.mk)' >> lineage.mk; fi;
+	if [ -f lineage.mk ]; then echo -e '\n$(call inherit-product, vendor/divested/build/target/product/lowram.mk)' >> lineage.mk; fi;
 	if [ -f BoardConfig.mk ]; then echo 'MALLOC_SVELTE := true' >> BoardConfig.mk; fi;
 	if [ -f BoardConfigCommon.mk ]; then echo 'MALLOC_SVELTE := true' >> BoardConfigCommon.mk; fi;
 	echo "Enabled lowram for $1";
diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh
index dded8f89..bd337621 100644
--- a/Scripts/LineageOS-15.1/Patch.sh
+++ b/Scripts/LineageOS-15.1/Patch.sh
@@ -77,7 +77,7 @@ enterAndClear "device/qcom/sepolicy";
 patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/0001-Camera_Fix.patch"; #Fix camera on -user builds XXX: REMOVE THIS TRASH
 
 enterAndClear "external/chromium-webview";
-git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/88/305088/2 #update webview
+git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/88/305088/3; #update webview
 
 enterAndClear "external/svox";
 git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles
@@ -180,6 +180,9 @@ sed -i 's/WallpaperUtils.EXTRA_WALLPAPER_OFFSET, 0);/WallpaperUtils.EXTRA_WALLPA
 enterAndClear "packages/inputmethods/LatinIME";
 patch -p1 < "$DOS_PATCHES_COMMON/android_packages_inputmethods_LatinIME/0001-Voice.patch"; #Remove voice input key
 
+enterAndClear "packages/providers/MediaProvider";
+patch -p1 < "$DOS_PATCHES/android_packages_providers_MediaProvider/0001-External_Permission.patch"; #Fix permission denial
+
 enterAndClear "packages/services/Telephony";
 patch -p1 < "$DOS_PATCHES/android_packages_services_Telephony/0001-PREREQ_Handle_All_Modes.patch";
 patch -p1 < "$DOS_PATCHES/android_packages_services_Telephony/0002-More_Preferred_Network_Modes.patch";
diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh
index 73b6c1f3..e6a206ad 100644
--- a/Scripts/LineageOS-16.0/Functions.sh
+++ b/Scripts/LineageOS-16.0/Functions.sh
@@ -117,8 +117,7 @@ export -f enableDexPreOpt;
 
 enableLowRam() {
 	cd "$DOS_BUILD_BASE$1";
-	#if [ -f lineage.mk ]; then echo '$(call inherit-product, $(SRC_TARGET_DIR)/product/go_defaults.mk)' >> lineage.mk; fi;
-	if [ -f lineage.mk ]; then echo '$(call inherit-product, vendor/divested/build/target/product/lowram.mk)' >> lineage.mk; fi;
+	if [ -f lineage.mk ]; then echo -e '\n$(call inherit-product, vendor/divested/build/target/product/lowram.mk)' >> lineage.mk; fi;
 	if [ -f BoardConfig.mk ]; then echo 'MALLOC_SVELTE := true' >> BoardConfig.mk; fi;
 	if [ -f BoardConfigCommon.mk ]; then echo 'MALLOC_SVELTE := true' >> BoardConfigCommon.mk; fi;
 	echo "Enabled lowram for $1";
diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh
index 7487cada..db28a910 100644
--- a/Scripts/LineageOS-16.0/Patch.sh
+++ b/Scripts/LineageOS-16.0/Patch.sh
@@ -79,7 +79,7 @@ patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy-legacy/0001-Camera_Fix.pa
 echo "SELINUX_IGNORE_NEVERALLOWS := true" >> sepolicy.mk; #necessary for -user builds of legacy devices
 
 enterAndClear "external/chromium-webview";
-git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/88/305088/2 #update webview
+git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/88/305088/3; #update webview
 
 enterAndClear "external/svox";
 git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh
new file mode 100644
index 00000000..d1d1ac5b
--- /dev/null
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh
@@ -0,0 +1,256 @@
+#!/bin/bash
+cd "$DOS_BUILD_BASE""kernel/oneplus/sm7250"
+git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0082-0083.patch --exclude=Makefile
+git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0137-0138.patch --exclude=Makefile
+git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0144-0145.patch --exclude=Makefile
+git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0156-0157.patch --exclude=Makefile
+git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7837/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3695/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5873/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9415/ANY/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20669/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0145/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0148/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0148/4.19/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0154/4.19/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0154/4.19/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0155/4.19/0023.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0155/4.19/0024.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0155/4.19/0025.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0155/4.19/0026.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0155/4.19/0027.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0155/4.19/0028.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0155/4.19/0029.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0155/4.19/0030.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0155/4.19/0031.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0155/4.19/0032.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0155/4.19/0033.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3874/ANY/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9444/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10220/4.19/0010.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10220/4.19/0011.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11191/^5.0.7/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12378/^5.1.5/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12379/^5.1.5/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12380/^5.1.5/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12381/^5.1.5/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12455/^5.1.5/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12456/^5.1.5/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12614/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14615/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14895/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14896/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14901/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15098/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15099/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15217/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15291/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16229/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16232/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16234/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-18683/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-18786/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-18808/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-18809/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-18813/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-18814/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-18885/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19036/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19037/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19045/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19046/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19048/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/4.19/0010.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19052/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19054/4.19/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19056/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19057/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19058/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19059/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19060/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19061/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19062/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19063/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19065/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19066/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19067/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19068/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19071/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19072/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19073/4.19/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19074/4.19/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19077/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19078/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19079/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19082/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19227/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19252/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19318/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19332/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19447/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19448/4.19/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19462/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19524/4.19/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19526/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19529/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19532/4.19/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19534/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19602/^5.4.2/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19767/4.19/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19768/4.19/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19768/4.19/0010.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19770/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19813/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19922/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19927/4.19/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19927/^5.0/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19947/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19965/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20806/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20810/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20812/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20908/^5.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0041/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0067/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0423/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0432/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0444/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0465/4.19/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.19/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-1749/4.19/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-2732/4.19/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-2732/4.19/0010.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-7053/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8992/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10135/4.19/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10135/4.19/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10135/4.19/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10690/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10711/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10732/4.19/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10757/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10766/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10773/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10781/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10942/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11125/ANY/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11146/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11162/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11230/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11261/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11494/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11609/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11668/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11669/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11884/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12351/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/3.6-^5.10/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/ANY/0011.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12465/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12652/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12653/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12654/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12655/^5.6.10/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12656/4.19/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12656/4.19/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12659/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12768/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12769/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12770/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12771/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12826/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13143/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/4.19/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/4.19/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14351/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/4.19/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14385/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/4.19/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15436/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15437/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15780/^5.7.7/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16120/^5.7/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24394/^5.7.8/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24490/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25211/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25212/4.19/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25284/4.19/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/4.19/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25641/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25645/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25668/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25669/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25704/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26088/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27777/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27786/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28374/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.19/0010.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.19/0011.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.19/0012.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28941/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29368/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29370/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29372/^5.7/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.19/0011.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.19/0012.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.19/0013.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.19/0014.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.19/0015.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29569/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-35508/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-BleedingToothExtras/^5.10/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0342/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20177/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.19/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.19/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.19/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.19/0011.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.19/0012.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.19/0013.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.19/0014.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.19/0015.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27365/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27365/4.19/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28038/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28038/4.19/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28039/^5.11/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.19/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-2732/4.19/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.19/0003.patch
+editKernelLocalversion "-dos.p252"
+cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_universal9810.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_universal9810.sh
deleted file mode 100644
index 10d33630..00000000
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_universal9810.sh
+++ /dev/null
@@ -1,199 +0,0 @@
-#!/bin/bash
-cd "$DOS_BUILD_BASE""kernel/samsung/universal9810"
-git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0218-0219.patch --exclude=Makefile
-git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0239-0240.patch --exclude=Makefile
-git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0242-0243.patch --exclude=Makefile
-git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0260-0261.patch --exclude=Makefile
-git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.10+/0016.patch
-git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.10+/0020.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0025.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0026.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0031.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0032.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0033.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0034.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0035.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0041.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0043.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0044.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0046.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0048.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0049.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0050.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7837/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3695/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0605/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/4.9/0010.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/ANY/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7477/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11036/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13693/^4.12.9/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13694/^4.12.9/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000252/^4.13.3/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3575/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8043/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10323/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11939/ANY/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13094/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13917/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20855/^4.18.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0145/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0148/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9453/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10527/ANY/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12378/^5.1.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12455/^5.1.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12456/^5.1.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15291/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16921/^4.17/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-18808/4.9/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/4.9/0013.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19054/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19073/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19074/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19318/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19448/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19462/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19813/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19816/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19947/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20810/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20908/^5.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0067/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0423/^5.9/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0433/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0465/4.9/0011.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0465/4.9/0012.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.9/0012.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.9/0026.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.9/0027.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.9/0028.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.9/0029.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.9/0030.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-1749/4.9/0011.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-4788/4.9/0015.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-4788/4.9/0016.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-4788/4.9/0017.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-4788/4.9/0018.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-4788/4.9/0019.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-4788/4.9/0020.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-4788/4.9/0021.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-4788/4.9/0022.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10711/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10732/4.9/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10757/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10766/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/ANY/0011.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12464/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12656/4.9/0010.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12656/4.9/0011.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12769/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12770/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12771/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12826/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14305/4.9/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14351/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15436/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15437/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24394/^5.7.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25211/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25212/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25284/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25641/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25645/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25668/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25669/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25705/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26088/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/4.9/0049.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/4.9/0050.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/4.9/0051.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/4.9/0052.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/4.9/0053.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/4.9/0054.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/4.9/0055.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/4.9/0056.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/4.9/0057.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/4.9/0058.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/4.9/0059.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/4.9/0060.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/4.9/0061.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/4.9/0062.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/4.9/0063.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/4.9/0064.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/4.9/0065.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/4.9/0066.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/4.9/0067.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/4.9/0068.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/4.9/0069.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/4.9/0070.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/4.9/0071.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/4.9/0072.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27786/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.9/0016.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.9/0017.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.9/0018.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29368/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29368/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0031.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0032.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0033.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0034.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0035.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29569/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-35508/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0399/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0036.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0037.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0038.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0039.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0040.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0041.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0042.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0043.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0044.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0045.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26930/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.9/0013.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.9/0014.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.9/0015.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.9/0021.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.9/0022.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.9/0023.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.9/0024.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.9/0025.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27365/4.9/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27365/4.9/0010.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28038/4.9/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28038/4.9/0010.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.9/0011.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch
-editKernelLocalversion "-dos.p195"
-cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh
index c61d4501..c770a1e5 100644
--- a/Scripts/LineageOS-17.1/Functions.sh
+++ b/Scripts/LineageOS-17.1/Functions.sh
@@ -18,7 +18,7 @@
 #Last verified: 2020-04-14
 
 patchAllKernels() {
-	startPatcher "kernel_cyanogen_msm8916 kernel_essential_msm8998 kernel_fairphone_msm8974 kernel_fairphone_sdm632 kernel_fxtec_msm8998 kernel_google_coral kernel_google_marlin kernel_google_msm kernel_google_msm-4.9 kernel_google_wahoo kernel_google_yellowstone kernel_htc_msm8974 kernel_lge_g3 kernel_lge_mako kernel_lge_msm8974 kernel_lge_msm8996 kernel_moto_shamu kernel_motorola_msm8916 kernel_motorola_msm8974 kernel_motorola_msm8992 kernel_motorola_msm8996 kernel_nextbit_msm8992 kernel_oneplus_msm8994 kernel_oneplus_msm8996 kernel_oneplus_msm8998 kernel_oneplus_sdm845 kernel_oneplus_sm8150 kernel_oppo_msm8974 kernel_razer_msm8998 kernel_samsung_jf kernel_samsung_msm8974 kernel_xiaomi_sdm845 kernel_yandex_sdm660 kernel_zuk_msm8996";
+	startPatcher "kernel_cyanogen_msm8916 kernel_essential_msm8998 kernel_fairphone_msm8974 kernel_fairphone_sdm632 kernel_fxtec_msm8998 kernel_google_coral kernel_google_marlin kernel_google_msm kernel_google_msm-4.9 kernel_google_wahoo kernel_google_yellowstone kernel_htc_msm8974 kernel_lge_g3 kernel_lge_mako kernel_lge_msm8974 kernel_lge_msm8996 kernel_moto_shamu kernel_motorola_msm8916 kernel_motorola_msm8974 kernel_motorola_msm8992 kernel_motorola_msm8996 kernel_nextbit_msm8992 kernel_oneplus_msm8994 kernel_oneplus_msm8996 kernel_oneplus_msm8998 kernel_oneplus_sdm845 kernel_oneplus_sm7250 kernel_oneplus_sm8150 kernel_oppo_msm8974 kernel_razer_msm8998 kernel_samsung_jf kernel_samsung_msm8974 kernel_xiaomi_sdm845 kernel_yandex_sdm660 kernel_zuk_msm8996";
 }
 export -f patchAllKernels;
 
@@ -118,6 +118,8 @@ buildAll() {
 	buildDevice flame avb;
 	#SD660
 	buildDevice Amber verity;
+	#SD765
+	buildDevice avicii avb;
 	#SD670
 	buildDevice bonito avb;
 	buildDevice sargo avb;
@@ -168,8 +170,7 @@ export -f enableDexPreOpt;
 
 enableLowRam() {
 	cd "$DOS_BUILD_BASE$1";
-	#if [ -f lineage.mk ]; then echo '$(call inherit-product, $(SRC_TARGET_DIR)/product/go_defaults.mk)' >> lineage.mk; fi;
-	if [ -f lineage.mk ]; then echo '$(call inherit-product, vendor/divested/build/target/product/lowram.mk)' >> lineage.mk; fi;
+	if [ -f lineage.mk ]; then echo -e '\n$(call inherit-product, vendor/divested/build/target/product/lowram.mk)' >> lineage.mk; fi;
 	if [ -f BoardConfig.mk ]; then echo 'MALLOC_SVELTE := true' >> BoardConfig.mk; fi;
 	if [ -f BoardConfigCommon.mk ]; then echo 'MALLOC_SVELTE := true' >> BoardConfigCommon.mk; fi;
 	echo "Enabled lowram for $1";
diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh
index 38c7740b..66748fe0 100644
--- a/Scripts/LineageOS-17.1/Patch.sh
+++ b/Scripts/LineageOS-17.1/Patch.sh
@@ -77,7 +77,7 @@ patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy-legacy/0001-Camera_Fix.pa
 echo "SELINUX_IGNORE_NEVERALLOWS := true" >> sepolicy.mk; #necessary for -user builds of legacy devices
 
 enterAndClear "external/chromium-webview";
-git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/88/305088/2 #update webview
+git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/88/305088/3; #update webview
 
 enterAndClear "external/svox";
 git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles
@@ -299,6 +299,9 @@ awk -i inplace '!/WfdCommon/' msm8996.mk; #fix breakage
 #enterAndClear "device/motorola/clark";
 #echo "TARGET_RECOVERY_PERMISSIVE_OVERRIDE := true" >> BoardConfig.mk; #Allow extract_firmware.sh to function
 
+enterAndClear "device/oneplus/avicii";
+enableVerity; #Resurrect dm-verity
+
 enterAndClear "device/oneplus/oneplus2";
 sed -i 's|etc/permissions/qti_libpermissions.xml|vendor/etc/permissions/qti_libpermissions.xml|' proprietary-files.txt;
 
diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh
index 9d66fe7e..bfab475e 100644
--- a/Scripts/LineageOS-18.1/Functions.sh
+++ b/Scripts/LineageOS-18.1/Functions.sh
@@ -140,8 +140,7 @@ export -f enableDexPreOpt;
 
 enableLowRam() {
 	cd "$DOS_BUILD_BASE$1";
-	#if [ -f lineage.mk ]; then echo '$(call inherit-product, $(SRC_TARGET_DIR)/product/go_defaults.mk)' >> lineage.mk; fi;
-	if [ -f lineage.mk ]; then echo '$(call inherit-product, vendor/divested/build/target/product/lowram.mk)' >> lineage.mk; fi;
+	if [ -f lineage.mk ]; then echo -e '\n$(call inherit-product, vendor/divested/build/target/product/lowram.mk)' >> lineage.mk; fi;
 	if [ -f BoardConfig.mk ]; then echo 'MALLOC_SVELTE := true' >> BoardConfig.mk; fi;
 	if [ -f BoardConfigCommon.mk ]; then echo 'MALLOC_SVELTE := true' >> BoardConfigCommon.mk; fi;
 	echo "Enabled lowram for $1";
diff --git a/Scripts/LineageOS-18.1/Patch.sh b/Scripts/LineageOS-18.1/Patch.sh
index 195c3e5b..4593b3c8 100644
--- a/Scripts/LineageOS-18.1/Patch.sh
+++ b/Scripts/LineageOS-18.1/Patch.sh
@@ -72,7 +72,7 @@ patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy-legacy/0001-Camera_Fix.pa
 echo "SELINUX_IGNORE_NEVERALLOWS := true" >> sepolicy.mk; #necessary for -user builds of legacy devices
 
 enterAndClear "external/chromium-webview";
-git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/88/305088/2 #update webview
+git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/88/305088/3; #update webview
 
 enterAndClear "external/svox";
 git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles