From dd460da4c37ea35cab0732fd01c5dfa3c4442601 Mon Sep 17 00:00:00 2001 From: Tad Date: Tue, 5 Dec 2017 11:26:57 -0500 Subject: [PATCH] Build fixes --- Patches/Linux | 2 +- .../CVE_Patchers/android_kernel_google_marlin.sh | 3 --- .../LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh | 4 ++-- .../CVE_Patchers/android_kernel_samsung_universal8890.sh | 3 +-- Scripts/LineageOS-14.1/Patch.sh | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index c4e6dd60..e4d74b10 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit c4e6dd60670a0dac94ae69e7583ec9b302c579ba +Subproject commit e4d74b10881dc778ce4c1beea63b5588b4d7e4e1 diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh index 25d34ae1..14f5aec8 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh @@ -4,7 +4,6 @@ git apply $cvePatches/CVE-2014-9900/ANY/0001.patch git apply $cvePatches/CVE-2015-2041/^3.19/0002.patch git apply $cvePatches/CVE-2015-7515/^4.4/0002.patch git apply $cvePatches/CVE-2015-8966/3.15+/0001.patch -git apply $cvePatches/CVE-2016-10044/ANY/0001.patch git apply $cvePatches/CVE-2016-10088/ANY/0001.patch git apply $cvePatches/CVE-2016-2187/ANY/0001.patch git apply $cvePatches/CVE-2016-2544/ANY/0001.patch @@ -60,8 +59,6 @@ git apply $cvePatches/CVE-2017-11001/ANY/0001.patch git apply $cvePatches/CVE-2017-11002/ANY/0002.patch git apply $cvePatches/CVE-2017-11013/qcacld-2.0/0002.patch git apply $cvePatches/CVE-2017-11014/qcacld-2.0/0001.patch -git apply $cvePatches/CVE-2017-11015/qcacld-2.0/0003.patch -git apply $cvePatches/CVE-2017-11015/qcacld-2.0/0004.patch git apply $cvePatches/CVE-2017-11016/ANY/0001.patch git apply $cvePatches/CVE-2017-11019/ANY/0001.patch git apply $cvePatches/CVE-2017-11025/ANY/0001.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh index 9615dfda..cf7d98cc 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh @@ -9,7 +9,7 @@ git apply $cvePatches/CVE-2015-8942/ANY/0001.patch git apply $cvePatches/CVE-2015-8955/ANY/0001.patch git apply $cvePatches/CVE-2015-8967/ANY/0001.patch git apply $cvePatches/CVE-2016-0758/ANY/0001.patch -git apply $cvePatches/CVE-2016-10044/ANY/0003.patch +git apply $cvePatches/CVE-2016-10044/3.10/0001.patch git apply $cvePatches/CVE-2016-10200/ANY/0001.patch git apply $cvePatches/CVE-2016-10208/3.10-^3.16/0001.patch git apply $cvePatches/CVE-2016-10230/ANY/0001.patch @@ -40,7 +40,7 @@ git apply $cvePatches/CVE-2016-6672/ANY/0001.patch git apply $cvePatches/CVE-2016-6693/ANY/0001.patch git apply $cvePatches/CVE-2016-6696/ANY/0001.patch git apply $cvePatches/CVE-2016-6738/ANY/0001.patch -git apply $cvePatches/CVE-2016-6741/3.10/0001.patch +#git apply $cvePatches/CVE-2016-6741/3.10/0001.patch git apply $cvePatches/CVE-2016-6751/ANY/0001.patch git apply $cvePatches/CVE-2016-6753/ANY/0001.patch git apply $cvePatches/CVE-2016-7117/^4.5/0002.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh index a68fcac1..7dab6320 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh @@ -14,8 +14,7 @@ git apply $cvePatches/CVE-2015-8839/ANY/0002.patch git apply $cvePatches/CVE-2015-8962/ANY/0001.patch git apply $cvePatches/CVE-2015-8966/3.15+/0001.patch git apply $cvePatches/CVE-2015-9004/ANY/0001.patch -git apply $cvePatches/CVE-2016-10044/ANY/0001.patch -git apply $cvePatches/CVE-2016-10044/ANY/0002.patch +git apply $cvePatches/CVE-2016-10044/3.18/0002.patch git apply $cvePatches/CVE-2016-10088/ANY/0001.patch git apply $cvePatches/CVE-2016-10200/ANY/0001.patch git apply $cvePatches/CVE-2016-2185/ANY/0001.patch diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index f087f524..7138a9f8 100755 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -250,7 +250,7 @@ sed -i 's/shouldUseOptimizations(weight)/true/' cm/lib/main/java/org/cyanogenmod #START OF DEVICE CHANGES # enter "device/motorola/clark" -enableDexPreOpt +#enableDexPreOpt patch -p1 < $patches"android_device_motorola_clark/0001-Tri_State_Torch.patch" #Tri-state torch #TODO: Remove releasetools firmware script, as it soft bricks the radio when flashing via AOSP recovery