Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2025-01-13 08:29:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixup OpenEUICC inclusion

Browse Source 
Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2023-08-21 17:56:38 -04:00
parent d6c3b6c8fa
commit 8b51c3cd0f
No known key found for this signature in database
GPG Key ID: B286E9F57A07424B
6 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Patches/Common/android_vendor_divested/packages.mk
View File

@ -13,11 +13,6 @@ PRODUCT_PACKAGES += \
# OpenCamera # OpenCamera
#endif #endif
ifeq (,$(filter crosshatch blueline bonito sargo coral flame sunfish barbet redfin bluejay oriole raven panther cheetah FP4,$(TARGET_PRODUCT))) #FIXME
PRODUCT_PACKAGES += \
OpenEUICC
endif
# Extras # Extras
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
TalkBack \ TalkBack \

2
Patches/LineageOS-20.0/android_frameworks_base/0039-package_hooks.patch
View File

@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dmitry Muhomor <muhomor.dmitry@gmail.com> From: Dmitry Muhomor <muhomor.dmitry@gmail.com>
Date: Mon, 27 Mar 2023 16:00:00 +0300 Date: Mon, 27 Mar 2023 16:00:00 +0300
Subject: [PATCH 1/2] add hooks for modifying PackageManagerService behavior Subject: [PATCH] add hooks for modifying PackageManagerService behavior
--- ---
.../server/ext/PackageManagerHooks.java | 90 +++++++++++++++++++ .../server/ext/PackageManagerHooks.java | 90 +++++++++++++++++++

2
Patches/LineageOS-20.0/android_frameworks_base/0040-euicc-restrictions.patch
View File

@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dmitry Muhomor <muhomor.dmitry@gmail.com> From: Dmitry Muhomor <muhomor.dmitry@gmail.com>
Date: Mon, 27 Mar 2023 16:29:13 +0300 Date: Mon, 27 Mar 2023 16:29:13 +0300
Subject: [PATCH 2/2] integrate Google's EuiccSupportPixel package Subject: [PATCH] integrate Google's EuiccSupportPixel package
Depends on commit: "don't crash apps that depend on missing Gservices provider" Depends on commit: "don't crash apps that depend on missing Gservices provider"

18
Scripts/Common/Functions.sh
View File

@ -721,6 +721,24 @@ disableAPEX() {
} }
export -f disableAPEX; export -f disableAPEX;
includeOE() {
cd "$DOS_BUILD_BASE/$1";
if [ -f device.mk ]; then
if grep -sq "euicc.xml" device.mk; then
echo -e "\nPRODUCT_PACKAGES += OpenEUICC" >> device.mk;
echo "Enabled OpenEUICC inclusion for $1";
fi;
fi;
if [ -f device-lineage.mk ]; then
if grep -sq "euicc.xml" device-lineage.mk; then
echo -e "\nPRODUCT_PACKAGES += OpenEUICC" >> device-lineage.mk;
echo "Enabled OpenEUICC inclusion for $1";
fi;
fi;
cd "$DOS_BUILD_BASE";
}
export -f includeOE;
enableStrongEncryption() { enableStrongEncryption() {
cd "$DOS_BUILD_BASE/$1"; cd "$DOS_BUILD_BASE/$1";
if [ -f BoardConfig.mk ]; then if [ -f BoardConfig.mk ]; then

2
Scripts/LineageOS-20.0/Patch.sh
View File

@ -439,7 +439,6 @@ sed -i 's/OpenCamera/Aperture/' packages.mk; #Use the LineageOS camera app
awk -i inplace '!/speed-profile/' build/target/product/lowram.mk; #breaks compile on some dexpreopt devices awk -i inplace '!/speed-profile/' build/target/product/lowram.mk; #breaks compile on some dexpreopt devices
sed -i 's/wifi,cell/internet/' overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml; #Use the modern quick tile sed -i 's/wifi,cell/internet/' overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml; #Use the modern quick tile
sed -i 's|system/etc|$(TARGET_COPY_OUT_PRODUCT)/etc|' divestos.mk; sed -i 's|system/etc|$(TARGET_COPY_OUT_PRODUCT)/etc|' divestos.mk;
if [ "$DOS_DEBLOBBER_REMOVE_EUICC_FULL" = true ]; then sed -i 's/OpenEUICC/OpenInvalidEUICC/' packages.mk; fi; #Handle OpenEUICC inclusion
fi; fi;
# #
#END OF ROM CHANGES #END OF ROM CHANGES
@ -530,6 +529,7 @@ find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {}
find "kernel" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenDefconfig "{}"'; find "kernel" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenDefconfig "{}"';
find "kernel" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'updateRegDb "{}"'; find "kernel" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'updateRegDb "{}"';
find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'disableAPEX "{}"'; find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'disableAPEX "{}"';
if [ "$DOS_DEBLOBBER_REMOVE_EUICC_FULL" = false ]; then find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'includeOE "{}"'; fi;
if [ "$DOS_GRAPHENE_EXEC" = true ]; then find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'disableEnforceRRO "{}"'; fi; if [ "$DOS_GRAPHENE_EXEC" = true ]; then find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'disableEnforceRRO "{}"'; fi;
cd "$DOS_BUILD_BASE"; cd "$DOS_BUILD_BASE";
deblobAudio; deblobAudio;

2
Scripts/init.sh
View File

@ -180,6 +180,8 @@ export TZ=:/etc/localtime;
export LC_ALL=C; export LC_ALL=C;
export LANG=C.UTF-8; export LANG=C.UTF-8;
if [[ "$DOS_VERSION" != "LineageOS-20.0" ]]; then export DOS_DEBLOBBER_REMOVE_EUICC_FULL=true; fi;
#START OF VERIFICATION #START OF VERIFICATION
gpgVerifyGitHead "$DOS_WORKSPACE_ROOT"; gpgVerifyGitHead "$DOS_WORKSPACE_ROOT";
gpgVerifyGitHead "$DOS_PREBUILT_APPS"; gpgVerifyGitHead "$DOS_PREBUILT_APPS";