diff --git a/Patches/LineageOS-20.0/android_packages_apps_Settings/0004-Private_DNS.patch b/Patches/LineageOS-20.0/android_packages_apps_Settings/0004-Private_DNS.patch index 486c5a7d..e1c9f240 100644 --- a/Patches/LineageOS-20.0/android_packages_apps_Settings/0004-Private_DNS.patch +++ b/Patches/LineageOS-20.0/android_packages_apps_Settings/0004-Private_DNS.patch @@ -81,10 +81,10 @@ index 12e29e693b..b6745806b5 100644 android:id="@+id/private_dns_mode_opportunistic" layout="@layout/preference_widget_dialog_radiobutton"/> diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml -index 1b120c170a..ec6789f819 100644 +index e78fa63658..14a89a9b04 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml -@@ -143,6 +143,21 @@ +@@ -146,6 +146,21 @@ Wi\u2011Fi data Enable usage of Wi\u2011Fi data diff --git a/Patches/LineageOS-20.0/android_system_sepolicy/0003-ptrace_scope-2.patch b/Patches/LineageOS-20.0/android_system_sepolicy/0003-ptrace_scope-2.patch index 0e2d5551..7a4a0f6c 100644 --- a/Patches/LineageOS-20.0/android_system_sepolicy/0003-ptrace_scope-2.patch +++ b/Patches/LineageOS-20.0/android_system_sepolicy/0003-ptrace_scope-2.patch @@ -77,7 +77,7 @@ index f235b35b7..895b8f1df 100644 persist.logd. u:object_r:logd_prop:s0 ro.logd. u:object_r:logd_prop:s0 diff --git a/prebuilts/api/33.0/private/property_contexts b/prebuilts/api/33.0/private/property_contexts -index b6bc34242..4c78ce46c 100644 +index 943d487ff..d2dfa0805 100644 --- a/prebuilts/api/33.0/private/property_contexts +++ b/prebuilts/api/33.0/private/property_contexts @@ -58,6 +58,7 @@ persist.nfc. u:object_r:nfc_prop:s0 @@ -89,7 +89,7 @@ index b6bc34242..4c78ce46c 100644 persist.logd. u:object_r:logd_prop:s0 ro.logd. u:object_r:logd_prop:s0 diff --git a/private/property_contexts b/private/property_contexts -index b6bc34242..4c78ce46c 100644 +index 943d487ff..d2dfa0805 100644 --- a/private/property_contexts +++ b/private/property_contexts @@ -58,6 +58,7 @@ persist.nfc. u:object_r:nfc_prop:s0 diff --git a/Scripts/LineageOS-20.0/Patch.sh b/Scripts/LineageOS-20.0/Patch.sh index 15ddd33b..5dfa2677 100644 --- a/Scripts/LineageOS-20.0/Patch.sh +++ b/Scripts/LineageOS-20.0/Patch.sh @@ -519,7 +519,7 @@ cd "$DOS_BUILD_BASE"; [[ -d kernel/oneplus/sm7250 ]] && echo -e "\nCONFIG_DEBUG_FS=n" >> kernel/oneplus/sm7250/arch/arm64/configs/vendor/lito-perf_defconfig; #compile failure [[ -d kernel/oneplus/sm8250 ]] && echo -e "\nCONFIG_DEBUG_FS=n" >> kernel/oneplus/sm8250/arch/arm64/configs/vendor/kona-perf_defconfig; #vintf failure [[ -d kernel/samsung/exynos9810 ]] && sed -i "s/CONFIG_RANDOMIZE_BASE=y/# CONFIG_RANDOMIZE_BASE is not set/" kernel/samsung/exynos9810/arch/arm64/configs/*_defconfig; #Breaks on compile -#[[ -d kernel/xiaomi/msm8937 ]] && sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/xiaomi/msm8937/arch/arm64/configs/*_defconfig; #Breaks on compile +[[ -d kernel/xiaomi/msm8937 ]] && sed -i "s/CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y/# CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY is not set/" kernel/xiaomi/msm8937/arch/arm64/configs/*_defconfig; #Breaks on compile sed -i 's/^YYLTYPE yylloc;/extern YYLTYPE yylloc;/' kernel/*/*/scripts/dtc/dtc-lexer.l* || true; #Fix builds with GCC 10 rm -v kernel/*/*/drivers/staging/greybus/tools/Android.mk || true;