Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2025-07-23 06:40:43 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix overlay conflicts

Browse source 
Should mostly fix https://github.com/Divested-Mobile/DivestOS-Build/issues/219

Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2023-07-06 14:50:40 -04:00
parent 34f2d0d15a
commit a1a3cbb94e
No known key found for this signature in database
GPG key ID: B286E9F57A07424B
7 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Scripts/LineageOS-14.1/Patch.sh
View file

@ -504,6 +504,7 @@ if [ "$DOS_DEBLOBBER_REMOVE_AUDIOFX" = true ]; then
awk -i inplace '!/AudioFX/' config/common.mk; #Remove AudioFX
awk -i inplace '!/AudioService/' config/common.mk;
fi;
awk -i inplace '!/config_multiuserMaximumUsers/' overlay/common/frameworks/base/core/res/res/values/config.xml; #Conflict
awk -i inplace '!/def_backup_transport/' overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml; #Unset default backup provider
sed -i 's/CM_BUILDTYPE := UNOFFICIAL/CM_BUILDTYPE := dos/' config/common.mk; #Change buildtype
echo 'include vendor/divested/divestos.mk' >> config/common.mk; #Include our customizations