From 1cde58eaa48e653182bdb06b573913c47153a072 Mon Sep 17 00:00:00 2001 From: Tad Date: Wed, 12 May 2021 02:42:50 -0400 Subject: [PATCH] Tiny tweaks --- Scripts/Common/Functions.sh | 2 +- Scripts/LineageOS-14.1/Patch.sh | 2 +- Scripts/LineageOS-15.1/Functions.sh | 3 +-- Scripts/LineageOS-15.1/Patch.sh | 2 +- Scripts/LineageOS-16.0/Patch.sh | 2 +- Scripts/LineageOS-17.1/Patch.sh | 2 +- Scripts/LineageOS-18.1/Patch.sh | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh index 6c10818e..9bccdc8f 100644 --- a/Scripts/Common/Functions.sh +++ b/Scripts/Common/Functions.sh @@ -663,7 +663,7 @@ hardenDefconfig() { do sed -i 's/# '"CONFIG_$option"' is not set/'"CONFIG_$option"'=y/' $defconfigPath &>/dev/null || true; #Some defconfigs are very minimal/not-autogenerated, so lets add the rest. Obviously most won't have any affect as they aren't supported. - if [[ "$defconfigPath" == *"lineage"* ]]; then + if [[ "$defconfigPath" == *"lineage"* ]] && [[ "$1" != *"kernel/oneplus/msm8996"* ]]; then if ! grep -q "CONFIG_$option=y" $defconfigPath; then echo "CONFIG_$option=y" | tee -a $defconfigPath > /dev/null; fi; diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index fbd532fe..44853bbc 100644 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -70,7 +70,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/57/308057/2; #update webview +git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/56/309756/1; #update webview enterAndClear "external/sqlite"; patch -p1 < "$DOS_PATCHES/android_external_sqlite/0001-Secure_Delete.patch"; #Enable secure_delete by default (AndroidHardening-13.0) diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index 8ab658d2..b360b2c7 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -82,8 +82,7 @@ export -f buildAll; patchWorkspace() { if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; - source build/envsetup.sh; - repopick -it O_asb_2021-05; + #source build/envsetup.sh; source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh"; diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index 893d5457..96f405b4 100644 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -71,7 +71,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/57/308057/2; #update webview +git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/56/309756/1; #update webview enterAndClear "external/svox"; git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index d695e640..6fb3b2c9 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -73,7 +73,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/57/308057/2; #update webview +git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/56/309756/1; #update webview enterAndClear "external/svox"; git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh index d1995837..0b4dc81c 100644 --- a/Scripts/LineageOS-17.1/Patch.sh +++ b/Scripts/LineageOS-17.1/Patch.sh @@ -70,7 +70,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/57/308057/2; #update webview +git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/56/309756/1; #update webview enterAndClear "external/svox"; git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles diff --git a/Scripts/LineageOS-18.1/Patch.sh b/Scripts/LineageOS-18.1/Patch.sh index 86d46ad7..4280730f 100644 --- a/Scripts/LineageOS-18.1/Patch.sh +++ b/Scripts/LineageOS-18.1/Patch.sh @@ -65,7 +65,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/57/308057/2; #update webview +git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/56/309756/1; #update webview enterAndClear "frameworks/base"; hardenLocationConf services/core/java/com/android/server/location/gps_debug.conf;