Remove some cherrypickings and get rid of dexpreopt patches

Patches/LineageOS-14.1/android_device_motorola_clark/0003-Enable_Dex_Preopt.patch

@@ -1,24 +0,0 @@
-From 44299d2cda16b60235cc682988d59dd3dcd823a5 Mon Sep 17 00:00:00 2001
-From: Tad <tad@spotco.us>
-Date: Fri, 18 Nov 2016 02:21:47 -0500
-Subject: [PATCH] Enable Dex-preopt
-
-Change-Id: I7634ebac4af7a977cff21a6be83bbda11dc943f4
----
- BoardConfig.mk | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/BoardConfig.mk b/BoardConfig.mk
-index 40022b4..250bbb5 100644
---- a/BoardConfig.mk
-+++ b/BoardConfig.mk
-@@ -182,3 +182,6 @@ TARGET_USES_WCNSS_MAC_ADDR_REV   := true
- WIFI_DRIVER_FW_PATH_STA          := "sta"
- WIFI_DRIVER_FW_PATH_AP           := "ap"
- WPA_SUPPLICANT_VERSION           := VER_0_8_X
-+
-+#Dex pre-optimization
-+WITH_DEXPREOPT := true
--- 
-2.9.3
-

Patches/LineageOS-14.1/android_device_oneplus_bacon/0002-Enable_Dex_Preopt.patch

@@ -1,25 +0,0 @@
-From e12aa9baa815d0279aab7756edc4e9c130f0bbff Mon Sep 17 00:00:00 2001
-From: Tad <tad@spotco.us>
-Date: Fri, 18 Nov 2016 02:23:46 -0500
-Subject: [PATCH] Enable Dex-preopt
-
-Change-Id: Id0ee761ca93a2a4cab0d40959610520b193d0528
----
- BoardConfig.mk | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/BoardConfig.mk b/BoardConfig.mk
-index 35bde5d..ff476f7 100644
---- a/BoardConfig.mk
-+++ b/BoardConfig.mk
-@@ -197,4 +197,7 @@ TARGET_LDPRELOAD := libNimsWrap.so
- endif
- endif
- 
-+#Dex pre-optimization
-+WITH_DEXPREOPT := true
-+
- -include vendor/oneplus/bacon/BoardConfigVendor.mk
--- 
-2.9.3
-

Scripts/LAOS-14.1_Patches.sh

@@ -31,7 +31,6 @@ mkdir -p "$ANDROID_HOME/licenses"
 echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
 echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
 
-#Define a function to simplify this script
 enter() {
 	dir=$1;
 	#project=${$dir//'/'/'_'}; #TODO: Add project conversion, to simplify patching
@@ -39,6 +38,10 @@ enter() {
 	echo "[ENTERING] "$dir;
 	git add -A && git reset --hard;
 }
+
+enableDexPreOpt() {
+	echo "WITH_DEXPREOPT := true" >> BoardConfig.mk
+}
 #
 #END OF PREPRATION
 #
@@ -92,16 +95,12 @@ patch -p1 < $patches"android_packages_apps_FDroidPrivilegedExtension/0002-Releas
 #release-keys: CB:1E:E2:EC:40:D0:5E:D6:78:F4:2A:E7:01:CD:FA:29:EE:A7:9D:0E:6D:63:32:76:DE:23:0B:F3:49:40:67:C3
 #test-keys: C8:A2:E9:BC:CF:59:7C:2F:B6:DC:66:BE:E2:93:FC:13:F2:FC:47:EC:77:BC:6B:2B:0D:52:C1:1F:51:19:2A:B8
 
-enter "vendor/cmsdk"
-git fetch https://review.lineageos.org/LineageOS/cm_platform_sdk refs/changes/21/148321/8 && git cherry-pick FETCH_HEAD #Network Traffic
-
 enter "vendor/cm"
 rm -rf gello #Gello is built out-of-tree and bundles Google Play Services library
 patch -p1 < $patches"android_vendor_cm/0001-SCE.patch" #Include our extras such as MicroG and F-Droid
 cp $patches"android_vendor_cm/sce.mk" config/sce.mk
 
 enter "packages/apps/CMParts"
-git fetch https://review.lineageos.org/LineageOS/android_packages_apps_CMParts refs/changes/15/113415/15 && git cherry-pick FETCH_HEAD #Network Traffic
 rm -rf src/org/cyanogenmod/cmparts/cmstats/ res/xml/anonymous_stats.xml res/xml/preview_data.xml #Nuke part of CMStats
 patch -p1 < $patches"android_packages_apps_CMParts/0001-Remove_Analytics.patch" #Remove the rest of CMStats
 
@@ -110,7 +109,6 @@ patch -p1 < $patches"android_packages_apps_SetupWizard/0001-Remove_Analytics.pat
 patch -p1 < $patches"android_packages_apps_SetupWizard/0002-No_GMS.patch" #Disable GMS page
 
 enter "frameworks/base"
-git fetch https://review.lineageos.org/LineageOS/android_frameworks_base refs/changes/75/151975/18 && git cherry-pick FETCH_HEAD #Network Traffic
 git revert 2aaa0472da8d254da1f07aa65a664012b52410f4 #re-enable doze on devices without gms
 #patch -p1 < $patches"android_frameworks_base/0002-Failed_Unlock_Shutdown.patch" #Shutdown after five failed unlock attempts FIXME: Update shutdown() to match new args
 patch -p1 < $patches"android_frameworks_base/0003-Signature_Spoofing.patch" #Allow packages to spoof their signature (MicroG)
@@ -125,18 +123,16 @@ rm core/res/res/values/config.xml.orig core/res/res/values/strings.xml.orig core
 #START OF DEVICE CHANGES
 #
 enter "device/motorola/clark"
-git fetch https://review.lineageos.org/LineageOS/android_device_motorola_clark refs/changes/99/160699/2 && git cherry-pick FETCH_HEAD #selinux
-patch -p1 < $patches"android_device_motorola_clark/0003-Enable_Dex_Preopt.patch" #Force enables dex pre-optimization
+enableDexPreOpt
 patch -p1 < $patches"android_device_motorola_clark/0004-Remove_Widevine.patch" #Removes Google Widevine and disables the DRM server
-#patch -p1 < $patches"android_device_motorola_clark/0005-TWRP.patch" #Add TWRP support
 
 enter "kernel/motorola/msm8992"
 patch -p1 < $patches"android_kernel_motorola_msm8992/0001-OverUnderClock.patch" #a57: 1.82Ghz -> 2.01Ghz, a53 1.44Ghz -> 1.63Ghz, 384Mhz -> 300Mhz	=+1.14Ghz TODO: Enable by default
 patch -p1 < $patches"android_kernel_motorola_msm8992/0002-MMC_Tweak.patch" #Improves MMC performance
 
 enter "device/oneplus/bacon"
+enableDexPreOpt
 patch -p1 < $patches"android_device_oneplus_bacon/0001-Remove_DRM.patch" #Removes Microsoft PlayReady and Google Widevine
-patch -p1 < $patches"android_device_oneplus_bacon/0002-Enable_Dex_Preopt.patch" #Force enables dex pre-optimization
 
 enter "kernel/oneplus/msm8974" #Consider switching to https://github.com/erorcun/android_kernel_oneplus_msm8974-3.10
 #patch -p1 < $patches"android_kernel_oneplus_msm8974/0001-OverUnderClock.patch" #300Mhz -> 268Mhz, 2.45Ghz -> 2.88Ghz	=+1.72Ghz