From 701f3361857a761fdd6b46d71df5cc1db73cc5e7 Mon Sep 17 00:00:00 2001 From: Tad Date: Sun, 28 Feb 2021 13:25:55 -0500 Subject: [PATCH] Tiny tweaks --- Patches/Common/apns-conf.xml | 5 ++--- Patches/Linux | 2 +- Scripts/LineageOS-14.1/Functions.sh | 2 -- Scripts/LineageOS-15.1/Functions.sh | 3 +-- Scripts/LineageOS-15.1/Patch.sh | 6 ------ 5 files changed, 4 insertions(+), 14 deletions(-) diff --git a/Patches/Common/apns-conf.xml b/Patches/Common/apns-conf.xml index 3b68ff06..56f64919 100644 --- a/Patches/Common/apns-conf.xml +++ b/Patches/Common/apns-conf.xml @@ -548,10 +548,8 @@ - + - - @@ -3192,6 +3190,7 @@ + diff --git a/Patches/Linux b/Patches/Linux index daa6fa23..f7d92008 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit daa6fa2317b430173d708c7060ae8ba7beee47bf +Subproject commit f7d920085ef130a667a8bbc40ea9ae2498aee267 diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 7bb32f38..cc21ddad 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -124,8 +124,6 @@ patchWorkspace() { source build/envsetup.sh; repopick -it n_asb_09-2018-qcom; #TODO: move in tree #repopick -it bt-sbc-hd-dualchannel-nougat; - repopick -it n-asb-2021-01; - repopick -it n-asb-2021-02; repopick -it tzdb2021a_N; export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index 2fb3c015..a041c905 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -115,8 +115,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-02; + #source build/envsetup.sh; export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index 4f214517..8e6393bb 100644 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -78,9 +78,6 @@ git revert --no-edit c9b0d95630b82cd0ad1a0fc633c6d59c2cb8aad7 37422f7df389f3ae5a 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/okhttp"; -git fetch "https://github.com/LineageOS/android_external_okhttp" refs/changes/47/303347/1 && git cherry-pick FETCH_HEAD; #O_asb_2021-02 - enterAndClear "external/svox"; git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles @@ -149,9 +146,6 @@ git apply "$DOS_PATCHES_COMMON/android_hardware_qcom_display/CVE-2019-2306-msm89 enterAndClear "hardware/qcom/gps"; git apply "$DOS_PATCHES_COMMON/android_hardware_qcom_gps/0001-rollover.patch"; #fix week rollover -enterAndClear "libcore"; -git fetch "https://github.com/LineageOS/android_libcore" refs/changes/53/303353/1 && git cherry-pick FETCH_HEAD; #O_asb_2021-02 - enterAndClear "lineage-sdk"; awk -i inplace '!/WeatherManagerServiceBroker/' lineage/res/res/values/config.xml; #Disable Weather if [ "$DOS_DEBLOBBER_REMOVE_AUDIOFX" = true ]; then awk -i inplace '!/LineageAudioService/' lineage/res/res/values/config.xml; fi;