Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-12-28 00:49:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update cherrypicks

Browse Source 
I managed to miss 300243 in the recent 17.1 rebuilds
This commit is contained in:
Tad 2021-01-14 11:55:36 -05:00
parent 55a9da29b0
commit a4333daefe
5 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PrebuiltApps

@ -1 +1 @@
Subproject commit b236dc94714dfb52458ad260155920f7600cafee Subproject commit 39e934da506dddea71f64c7d2b6eba7466f0d335

1
Scripts/LineageOS-16.0/Functions.sh
View File

@ -132,7 +132,6 @@ patchWorkspace() {
repopick -it hh-p-sepolicy; repopick -it hh-p-sepolicy;
repopick -i 232948; #wahoo: liblight: close fd repopick -i 232948; #wahoo: liblight: close fd
#repopick -it pie-firewall; #repopick -it pie-firewall;
repopick -it P_asb_2021-01;
repopick -it 300742; #update webview repopick -it 300742; #update webview
source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Patch.sh";

3
Scripts/LineageOS-16.0/Patch.sh
View File

@ -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) 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 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 if [ "$DOS_DEBLOBBER_REMOVE_IMS" = true ]; then
enterAndClear "frameworks/opt/net/ims"; enterAndClear "frameworks/opt/net/ims";
patch -p1 < "$DOS_PATCHES/android_frameworks_opt_net_ims/0001-Fix_Calling.patch"; #Fix calling when IMS is removed patch -p1 < "$DOS_PATCHES/android_frameworks_opt_net_ims/0001-Fix_Calling.patch"; #Fix calling when IMS is removed

3
Scripts/LineageOS-17.1/Functions.sh
View File

@ -129,9 +129,8 @@ patchWorkspace() {
source build/envsetup.sh; source build/envsetup.sh;
repopick -i 271361; #releasetools: python3 fix, 287339 (alt) repopick -i 271361; #releasetools: python3 fix, 287339 (alt)
#repopick -it ten-firewall; #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 300742; #update webview
repopick -it tzdb2020f_Q;
source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Patch.sh";
source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh"; source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";

6
Scripts/LineageOS-17.1/Patch.sh
View File

@ -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/OsuLogin; #Automatic Wi-Fi connection non-sense
rm -rf packages/PrintRecommendationService; #Creates popups to install proprietary print apps 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 if [ "$DOS_DEBLOBBER_REMOVE_IMS" = true ]; then
enterAndClear "frameworks/opt/net/ims"; enterAndClear "frameworks/opt/net/ims";
patch -p1 < "$DOS_PATCHES/android_frameworks_opt_net_ims/0001-Fix_Calling.patch"; #Fix calling when IMS is removed 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"; enterAndClear "system/extras";
patch -p1 < "$DOS_PATCHES/android_system_extras/0001-ext4_pad_filenames.patch"; #FBE: pad filenames more (GrapheneOS) 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"; 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"; #Fix -user builds for LGE devices
patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch" --directory="prebuilts/api/29.0"; patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch" --directory="prebuilts/api/29.0";