From a4333daefe915dc300bd0c5af35dad4014090b3f Mon Sep 17 00:00:00 2001 From: Tad Date: Thu, 14 Jan 2021 11:55:36 -0500 Subject: [PATCH] Update cherrypicks I managed to miss 300243 in the recent 17.1 rebuilds --- PrebuiltApps | 2 +- Scripts/LineageOS-16.0/Functions.sh | 1 - Scripts/LineageOS-16.0/Patch.sh | 3 --- Scripts/LineageOS-17.1/Functions.sh | 3 +-- Scripts/LineageOS-17.1/Patch.sh | 6 ------ 5 files changed, 2 insertions(+), 13 deletions(-) diff --git a/PrebuiltApps b/PrebuiltApps index b236dc94..39e934da 160000 --- a/PrebuiltApps +++ b/PrebuiltApps @@ -1 +1 @@ -Subproject commit b236dc94714dfb52458ad260155920f7600cafee +Subproject commit 39e934da506dddea71f64c7d2b6eba7466f0d335 diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index 17558dbc..0f3c0fd7 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -132,7 +132,6 @@ patchWorkspace() { repopick -it hh-p-sepolicy; repopick -i 232948; #wahoo: liblight: close fd #repopick -it pie-firewall; - repopick -it P_asb_2021-01; repopick -it 300742; #update webview source "$DOS_SCRIPTS/Patch.sh"; diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index 97055627..052dec89 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -109,9 +109,6 @@ sed -i '301i\ if(packageList.length() > 0) { packageList += ","; } packag if [ "$DOS_MICROG_INCLUDED" != "FULL" ]; then rm -rf packages/CompanionDeviceManager; fi; #Used to support Android Wear (which hard depends on GMS) rm -rf packages/PrintRecommendationService; #Creates popups to install proprietary print apps -enterAndClear "frameworks/minikin"; -git pull "https://github.com/LineageOS/android_frameworks_minikin" refs/changes/28/300228/1; #P_asb_2021-01 - if [ "$DOS_DEBLOBBER_REMOVE_IMS" = true ]; then enterAndClear "frameworks/opt/net/ims"; patch -p1 < "$DOS_PATCHES/android_frameworks_opt_net_ims/0001-Fix_Calling.patch"; #Fix calling when IMS is removed diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh index 0f5bf36c..6a06d8df 100644 --- a/Scripts/LineageOS-17.1/Functions.sh +++ b/Scripts/LineageOS-17.1/Functions.sh @@ -129,9 +129,8 @@ patchWorkspace() { source build/envsetup.sh; repopick -i 271361; #releasetools: python3 fix, 287339 (alt) #repopick -it ten-firewall; - repopick -it Q_asb_2021-01; - repopick -i 300244 300245 300246 300247 300248 300249 300250 300260 300386 300387; #misc bt asb patches repopick -it 300742; #update webview + repopick -it tzdb2020f_Q; source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh"; diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh index 0a3ff348..fff26c34 100644 --- a/Scripts/LineageOS-17.1/Patch.sh +++ b/Scripts/LineageOS-17.1/Patch.sh @@ -108,9 +108,6 @@ if [ "$DOS_MICROG_INCLUDED" != "FULL" ]; then rm -rf packages/CompanionDeviceMan rm -rf packages/OsuLogin; #Automatic Wi-Fi connection non-sense rm -rf packages/PrintRecommendationService; #Creates popups to install proprietary print apps -enterAndClear "frameworks/minikin"; -git pull "https://github.com/LineageOS/android_frameworks_minikin" refs/changes/81/300181/1; #Q_asb_2021-01 - if [ "$DOS_DEBLOBBER_REMOVE_IMS" = true ]; then enterAndClear "frameworks/opt/net/ims"; patch -p1 < "$DOS_PATCHES/android_frameworks_opt_net_ims/0001-Fix_Calling.patch"; #Fix calling when IMS is removed @@ -195,9 +192,6 @@ if [ "$DOS_GRAPHENE_MALLOC" = true ]; then patch -p1 < "$DOS_PATCHES/android_sys enterAndClear "system/extras"; patch -p1 < "$DOS_PATCHES/android_system_extras/0001-ext4_pad_filenames.patch"; #FBE: pad filenames more (GrapheneOS) -enterAndClear "system/security"; -git pull "https://github.com/LineageOS/android_system_security" refs/changes/86/300186/1; #Q_asb_2021-01 - enterAndClear "system/sepolicy"; patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch"; #Fix -user builds for LGE devices patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch" --directory="prebuilts/api/29.0";