From d87457630aec83ff74047d4e0b957b20dfbbd33b Mon Sep 17 00:00:00 2001 From: Tad Date: Sun, 26 Jan 2020 21:17:33 -0500 Subject: [PATCH] Update cherrypicks --- Patches/Linux | 2 +- PrebuiltApps | 2 +- Scripts/LineageOS-11.0/Functions.sh | 1 + Scripts/LineageOS-14.1/Functions.sh | 2 +- Scripts/LineageOS-15.1/Functions.sh | 3 +-- Scripts/LineageOS-16.0/Functions.sh | 3 +-- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index 53fc110d..2c170af2 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 53fc110d30c90ced38a8404ed8bdb21a3a1b2018 +Subproject commit 2c170af28f69676bd01984a2ece8c62f1e017e20 diff --git a/PrebuiltApps b/PrebuiltApps index 0be89e79..f5198ddc 160000 --- a/PrebuiltApps +++ b/PrebuiltApps @@ -1 +1 @@ -Subproject commit 0be89e79fa522747592a8c5aa97a9406cd1eaed6 +Subproject commit f5198ddce82a4b9974d8ad180bde7927c45c1bbb diff --git a/Scripts/LineageOS-11.0/Functions.sh b/Scripts/LineageOS-11.0/Functions.sh index d06fd8fc..ef8e775d 100644 --- a/Scripts/LineageOS-11.0/Functions.sh +++ b/Scripts/LineageOS-11.0/Functions.sh @@ -69,6 +69,7 @@ patchWorkspace() { repopick -it asb-2019.10-cm11; repopick -it asb-2019.11-cm11; repopick -it asb-2019.12-cm11; + repopick -it asb-2020.01-cm11; source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Defaults.sh"; diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index c90a7f97..1d0d3f50 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -117,7 +117,7 @@ patchWorkspace() { repopick -it n_asb_09-2018-qcom; repopick -it ibss-mode-nougat; repopick -it n-netd; - repopick 264489; #update chromium + repopick 267513; #update chromium repopick -it n-asb-2020-01; 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 a9452808..be5d47a7 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -101,8 +101,7 @@ 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 264489; #update chromium - repopick -it O_asb_2020-01; + repopick 267513; #update chromium export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index ee14bffa..febc235d 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -113,8 +113,7 @@ 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 264489; #update chromium - repopick -it P_asb_2020-01; + repopick 267513; #update chromium source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Defaults.sh";