diff --git a/Manifests/Manifest_LAOS-16.0.xml b/Manifests/Manifest_LAOS-16.0.xml
index 8d0dbf42..4aed54d6 100644
--- a/Manifests/Manifest_LAOS-16.0.xml
+++ b/Manifests/Manifest_LAOS-16.0.xml
@@ -101,14 +101,6 @@
-
-
-
-
-
-
-
-
@@ -122,18 +114,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -144,23 +124,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -173,31 +141,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -241,17 +192,6 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh
index fba3e71d..b21f41cc 100644
--- a/Scripts/LineageOS-16.0/Functions.sh
+++ b/Scripts/LineageOS-16.0/Functions.sh
@@ -18,7 +18,7 @@
#Last verified: 2018-04-27
patchAllKernels() {
- startPatcher "kernel_asus_fugu kernel_asus_msm8953 kernel_cyanogen_msm8916 kernel_cyanogen_msm8974 kernel_essential_msm8998 kernel_fairphone_msm8974 kernel_fairphone_sdm632 kernel_fxtec_msm8998 kernel_google_bonito kernel_google_crosshatch kernel_google_marlin kernel_google_msm kernel_google_wahoo kernel_google_yellowstone kernel_htc_msm8974 kernel_lge_g3 kernel_lge_hammerhead kernel_lge_mako kernel_lge_msm8974 kernel_moto_shamu kernel_motorola_msm8974 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_samsung_smdk4412 kernel_xiaomi_sdm845 kernel_yandex_sdm660 kernel_zuk_msm8996";
+ startPatcher "kernel_asus_fugu kernel_asus_msm8953 kernel_cyanogen_msm8916 kernel_cyanogen_msm8974 kernel_fairphone_sdm632 kernel_fxtec_msm8998 kernel_google_bonito kernel_google_crosshatch kernel_google_msm kernel_google_wahoo kernel_google_yellowstone kernel_lge_hammerhead kernel_lge_msm8974 kernel_motorola_msm8974 kernel_motorola_msm8996 kernel_nextbit_msm8992 kernel_oneplus_msm8994 kernel_oneplus_msm8996 kernel_oneplus_msm8998 kernel_oneplus_sdm845 kernel_oneplus_sm8150 kernel_razer_msm8998 kernel_samsung_smdk4412 kernel_xiaomi_sdm845 kernel_yandex_sdm660 kernel_zuk_msm8996";
}
export -f patchAllKernels;
@@ -59,8 +59,6 @@ buildAll() {
cd "$DOS_BUILD_BASE";
if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanWorkspaceForMalware; fi;
if [ "$DOS_OPTIMIZE_IMAGES" = true ]; then optimizeImagesRecursive "$DOS_BUILD_BASE"; fi;
- #SDS4P
- #buildDevice flo; #broken encryption
#SD800
buildDevice hammerhead; #broken sepolicy?
#SD801
@@ -74,7 +72,6 @@ buildAll() {
#Intel
buildDevice fugu; #broken - ninja: error: 'libpcre2.so' missing and no known rule to make it
- buildDevice mako; #Last version without repartitioning required
buildDevice cheeseburger verity; #needs manual patching - vendor common makefile #17.1 isn't booting
buildDevice dumpling verity;
buildDevice yellowstone; #broken sepolicy?
@@ -86,15 +83,7 @@ buildAll() {
#SD800
buildDevice d802;
#SD801
- buildDevice bacon;
- buildDevice d852;
- buildDevice d855;
- buildDevice FP2;
- buildDevice klte;
- buildDevice m8;
buildDevice victara;
- #SD805
- buildDevice shamu verity;
#SD808
buildDevice ether;
#SD810
@@ -103,16 +92,10 @@ buildAll() {
buildDevice oneplus3 verity;
buildDevice griffin;
buildDevice z2_plus verity;
- #SD821
- buildDevice marlin verity;
- buildDevice sailfish verity;
#SD632
buildDevice FP3 avb;
#SD835
buildDevice cheryl verity;
- buildDevice mata verity;
- buildDevice taimen avb;
- buildDevice walleye avb;
#SD845
buildDevice beryllium;
buildDevice crosshatch avb;
diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh
index f022c798..98cd354f 100644
--- a/Scripts/LineageOS-16.0/Patch.sh
+++ b/Scripts/LineageOS-16.0/Patch.sh
@@ -231,10 +231,6 @@ echo "PRODUCT_PACKAGES += vendor.lineage.trust@1.0-service" >> packages.mk; #All
#
#START OF DEVICE CHANGES
#
-enterAndClear "device/asus/flo";
-compressRamdisks;
-echo "/dev/block/platform/msm_sdcc\.1/by-name/misc u:object_r:misc_block_device:s0" >> sepolicy/file_contexts;
-
enterAndClear "device/asus/zenfone3";
rm -rf libhidl; #breaks other devices
@@ -250,42 +246,17 @@ enableVerity; #Resurrect dm-verity
enterAndClear "device/google/crosshatch";
enableVerity; #Resurrect dm-verity
-enterAndClear "device/google/marlin";
-git revert --no-edit eeb92c0f094f58b1bdfbaa775d239948f81e915b 8c729e4b016a5b35159992413a22c289ecf2c44c; #remove some carrier blobs
-patch -p1 < "$DOS_PATCHES/android_device_google_marlin/0001-Fix_MediaProvider_Deadlock.patch"; #Fix MediaProvider using 100% CPU (due to broken ppoll on functionfs?)
-
enterAndClear "device/google/wahoo";
patch -p1 < "$DOS_PATCHES/android_device_google_wahoo/232948.patch"; #liblight: close fd
enterAndClear "device/lge/g2-common";
sed -i '3itypeattribute hwaddrs misc_block_device_exception;' sepolicy/hwaddrs.te;
-enterAndClear "device/lge/g3-common";
-patch -p1 < "$DOS_PATCHES/android_device_lge_g3-common/254249.patch"; #g3-common: Add NFC HAL to proprietary-files
-sed -i '3itypeattribute hwaddrs misc_block_device_exception;' sepolicy/hwaddrs.te;
-sed -i '1itypeattribute wcnss_service misc_block_device_exception;' sepolicy/wcnss_service.te;
-
-enterAndClear "device/lge/d852";
-git revert --no-edit dbebbce20b2b303fe13f7078ef54154f9dd5d9e2; #fix nfc path
-
-enterAndClear "device/lge/d855";
-git revert --no-edit 9a5739e66d0a44347881807c0cc44d7c318c02b8; #fix nfc path
-
enterAndClear "device/lge/hammerhead";
git am $DOS_PATCHES/android_device_lge_hammerhead/*.patch; #hh-p-sepolicy
rm -rf bdAddrLoader; #duplicate with mako
echo "SELINUX_IGNORE_NEVERALLOWS := true" >> BoardConfig.mk; #qcom-legacy sepolicy
-enterAndClear "device/lge/mako";
-#git revert ; #restore releasetools #TODO
-smallerSystem;
-sed -i 's/1333788672/880803840/' BoardConfig.mk; #don't touch partitions! DOS -user fits with 40M free
-awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfig.mk;
-echo "pmf=0" >> wifi/wpa_supplicant_overlay.conf; #Wi-Fi chipset doesn't support PMF
-
-#enterAndClear "device/moto/shamu";
-#git revert --no-edit 05fb49518049440f90423341ff25d4f75f10bc0c; #restore releasetools #TODO
-
enterAndClear "device/oneplus/oneplus2";
sed -i 's|etc/permissions/qti_libpermissions.xml|vendor/etc/permissions/qti_libpermissions.xml|' proprietary-files.txt;
@@ -296,18 +267,9 @@ awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #disabl
enterAndClear "device/oneplus/sm8150-common";
enableVerity; #Resurrect dm-verity
-enterAndClear "device/oppo/common";
-awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #disable releasetools to fix delta ota generation
-
-enterAndClear "device/oppo/msm8974-common";
-sed -i "s/TZ.BF.2.0-2.0.0134/TZ.BF.2.0-2.0.0134|TZ.BF.2.0-2.0.0137/" board-info.txt; #Suport new TZ firmware https://review.lineageos.org/#/c/178999/
-
enterAndClear "device/zuk/msm8996-common";
awk -i inplace '!/WfdCommon/' msm8996.mk; #fix breakage
-enterAndClear "kernel/google/marlin";
-git revert --no-edit 568f99db3c9a590912f533fa734c46cf7a25dcbd; #Resurrect dm-verity
-
enterAndClear "kernel/google/wahoo";
sed -i 's/asm(SET_PSTATE_UAO(1));/asm(SET_PSTATE_UAO(1)); return 0;/' arch/arm64/mm/fault.c; #fix build with CONFIG_ARM64_UAO
@@ -330,7 +292,6 @@ removeBuildFingerprints;
sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/asus/msm8953/arch/arm64/configs/*_defconfig; #Breaks on compile
sed -i "s/CONFIG_DEBUG_RODATA=y/# CONFIG_DEBUG_RODATA is not set/" kernel/google/msm/arch/arm/configs/lineageos_*_defconfig; #Breaks on compile
sed -i "s/CONFIG_DEBUG_RODATA=y/# CONFIG_DEBUG_RODATA is not set/" kernel/google/yellowstone/arch/arm*/configs/*_defconfig; #Breaks on compile
-sed -i "s/CONFIG_DEBUG_RODATA=y/# CONFIG_DEBUG_RODATA is not set/" kernel/lge/mako/arch/arm/configs/lineageos_*_defconfig; #Breaks on compile
sed -i "s/CONFIG_DEBUG_RODATA=y/# CONFIG_DEBUG_RODATA is not set/" kernel/motorola/msm8974/arch/arm/configs/lineageos_*_defconfig; #Breaks on compile
sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/motorola/msm8996/arch/arm64/configs/*_defconfig; #Breaks on compile
sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/oneplus/msm8996/arch/arm64/configs/lineageos_*_defconfig; #Breaks on compile