Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2025-05-02 06:26:20 -04:00
Code Issues Projects Releases Packages Wiki Activity

21.0: More work

Browse source 
Signed-off-by: Tavi <tavi@divested.dev>
This commit is contained in:
Tavi 2024-05-20 18:26:50 -04:00
parent 07951955d3
commit 23a2127669
No known key found for this signature in database
GPG key ID: E599F62ECBAEAF2E
14 changed files with 112 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Scripts/Common/Deblob.sh
View file

@ -818,6 +818,7 @@ deblobVendorBp() {
sed -i ':a;N;s/\n/&/3;Ta;/manifest_android.hardware.drm-service.widevine.xml/!{P;D};:b;N;s/\n/&/8;Tb;d' "$bpfile";
sed -i ':a;N;s/\n/&/3;Ta;/manifest_vendor.xiaomi.hardware.mlipay.xml/!{P;D};:b;N;s/\n/&/8;Tb;d' "$bpfile";
sed -i ':a;N;s/\n/&/3;Ta;/vendor.qti.hardware.radio.atcmdfwd@1.0.xml/!{P;D};:b;N;s/\n/&/8;Tb;d' "$bpfile";
sed -i ':a;N;s/\n/&/3;Ta;/com.google.android.widevine-.*.apex/!{P;D};:b;N;s/\n/&/6;Tb;d' "$bpfile";
if [ "$DOS_DEBLOBBER_REMOVE_FACE" = true ]; then
sed -i ':a;N;s/\n/&/3;Ta;/android.hardware.biometrics.face-service.22.pixel.xml/!{P;D};:b;N;s/\n/&/8;Tb;d' "$bpfile";
sed -i ':a;N;s/\n/&/3;Ta;/manifest_face.xml/!{P;D};:b;N;s/\n/&/8;Tb;d' "$bpfile";

6
Scripts/LineageOS-21.0/Functions.sh
View file

@ -33,7 +33,7 @@ export -f scanWorkspaceForMalware;
buildDevice() {
cd "$DOS_BUILD_BASE";
if [[ -d "$DOS_SIGNING_KEYS/$1" ]]; then
breakfast "lineage_$1-user" && mka target-files-package otatools && processRelease $1 true $2;
breakfast "lineage_$1-ap1a-user" && mka target-files-package otatools && processRelease $1 true $2;
else
echo -e "\e[0;31mNo signing keys available for $1\e[0m";
fi;
@ -42,7 +42,7 @@ export -f buildDevice;
buildDeviceDebug() {
cd "$DOS_BUILD_BASE";
brunch "lineage_$1-eng";
brunch "lineage_$1-ap1a-eng";
}
export -f buildDeviceDebug;
@ -79,7 +79,7 @@ patchWorkspaceReal() {
sh "$DOS_SCRIPTS/Rebrand.sh";
sh "$DOS_SCRIPTS_COMMON/Optimize.sh";
sh "$DOS_SCRIPTS_COMMON/Deblob.sh";
#sh "$DOS_SCRIPTS_COMMON/Patch_CVE.sh";
#sh "$DOS_SCRIPTS_COMMON/Patch_CVE.sh"; #TODO: 21REBASE
sh "$DOS_SCRIPTS_COMMON/Post.sh";
source build/envsetup.sh;
}

2
Scripts/LineageOS-21.0/Patch.sh
View file

@ -440,12 +440,14 @@ fi;
if enterAndClear "device/google/gs101"; then
git revert --no-edit adfcf46ec8c099e77cf58ec87d02bafc78a0d01e; #potential breakage
if [ "$DOS_DEBLOBBER_REMOVE_CNE" = true ]; then sed -i '/google iwlan/,+8d' device.mk; fi; #fix stray
awk -i inplace '!/widevine.mk/' device.mk;
fi;
if enterAndClear "device/google/gs201"; then
if [ "$DOS_DEBLOBBER_REMOVE_CNE" = true ]; then sed -i '/google iwlan/,+8d' device.mk; fi; #fix stray
if [ "$DOS_DEBLOBBER_REMOVE_EUICC" = true ]; then sed -i '/eSIM MEP/,+4d' device.mk; fi; #fix stray
rm -rfv widevine;
awk -i inplace '!/widevine.mk/' device.mk;
fi;
if enterAndClear "device/google/gs-common"; then