From d6dca6e66dead564df02c358e4474061ed6fe408 Mon Sep 17 00:00:00 2001 From: Tad Date: Sat, 26 Jun 2021 14:13:03 -0400 Subject: [PATCH] Small tweaks --- PrebuiltApps | 2 +- Scripts/Common/Deblob.sh | 4 ++-- Scripts/Common/Functions.sh | 2 +- Scripts/LineageOS-14.1/Patch.sh | 4 +++- Scripts/LineageOS-15.1/Patch.sh | 4 +++- Scripts/LineageOS-16.0/Patch.sh | 4 +++- Scripts/LineageOS-17.1/Patch.sh | 4 +++- Scripts/LineageOS-18.1/Patch.sh | 4 +++- Scripts/init.sh | 3 ++- 9 files changed, 21 insertions(+), 10 deletions(-) diff --git a/PrebuiltApps b/PrebuiltApps index 37e78ed7..27e322a2 160000 --- a/PrebuiltApps +++ b/PrebuiltApps @@ -1 +1 @@ -Subproject commit 37e78ed7be2092d647c6d20b03fc71f5e9657549 +Subproject commit 27e322a2c3e616663d0d04f27bbda6854488b4a0 diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh index 539e006a..fe5bccca 100644 --- a/Scripts/Common/Deblob.sh +++ b/Scripts/Common/Deblob.sh @@ -241,7 +241,7 @@ echo "Deblobbing..."; makes=$makes"|android.hardware.telephony.euicc.*"; #Google Camera - blobs=$blobs"|com.google.android.camera.*"; + #blobs=$blobs"|com.google.android.camera.*"; #XXX: breaks cameara on Pixel 2? #Google Setup Wizard blobs=$blobs"|DreamlinerPrebuilt.apk|DreamlinerUpdater.apk"; @@ -400,7 +400,7 @@ echo "Deblobbing..."; blobs=$blobs"|libdme_main.so|libwbxmlparser.so|libprovlib.so"; blobs=$blobs"|dm_agent|dm_agent_binder"; blobs=$blobs"|npsmobex"; #Samsung? - blobs=$blobs"|ConnMO.apk|OmaDmclient.apk|USCCDM.apk|com.android.omadm.service.xml|DCMO.apk|DiagMon.apk|DMConfigUpdate.apk|DMConfigUpdateLight.apk|DMService.apk|libdmengine.so|libdmjavaplugin.so|SprintDM.apk|SDM.apk|whitelist_com.android.omadm.service.xml|com.android.sdm.plugins.connmo.xml|com.android.sdm.plugins.sprintdm.xml|com.google.omadm.trigger.xml|com.android.sdm.plugins.diagmon.xml|com.android.sdm.plugins.dcmo.xml"; #Sprint + blobs=$blobs"|ConnMO.apk|OmaDmclient.apk|USCCDM.apk|com.android.omadm.service.xml|DCMO.apk|DiagMon.apk|DMConfigUpdate.apk|DMConfigUpdateLight.apk|DMService.apk|libdmengine.so|libdmjavaplugin.so|SprintDM.apk|SDM.apk|whitelist_com.android.omadm.service.xml|com.android.sdm.plugins.connmo.xml|com.android.sdm.plugins.sprintdm.xml|com.google.omadm.trigger.xml|com.android.sdm.plugins.diagmon.xml|com.android.sdm.plugins.dcmo.xml|com.android.sdm.plugins.usccdm.xml"; #Sprint #OpenMobileAPI [SIM Alliance] #https://github.com/seek-for-android/platform_packages_apps_SmartCardService diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh index c7976064..0ce185a2 100644 --- a/Scripts/Common/Functions.sh +++ b/Scripts/Common/Functions.sh @@ -116,7 +116,7 @@ generateBootAnimationMask() { local text=$1; local font=$2 local output=$3; - convert -background black -fill transparent -font "$font" -gravity center -size 512x128 label:"$text\n"$(date +%Y.%m) "$output"; + convert -background black -fill transparent -font "$font" -gravity center -size 512x128 label:"$text" "$output"; optipng "$output"; } export -f generateBootAnimationMask; diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index c3099c74..68930d26 100644 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -69,8 +69,10 @@ enterAndClear "device/qcom/sepolicy"; patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/248649.patch"; #msm_irqbalance: Allow read for stats and interrupts patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/0001-Camera_Fix.patch"; #Fix camera on user builds XXX: REMOVE THIS TRASH +if [ "$(type -t DOS_WEBVIEW_CHERRYPICK)" = "alias" ] ; then enterAndClear "external/chromium-webview"; -git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/60/312860/1; #update webview +DOS_WEBVIEW_CHERRYPICK; #update webview +fi; enterAndClear "external/sqlite"; patch -p1 < "$DOS_PATCHES/android_external_sqlite/0001-Secure_Delete.patch"; #Enable secure_delete by default (AndroidHardening-13.0) diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index 97ab5526..112ae093 100644 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -70,8 +70,10 @@ git revert --no-edit c9b0d95630b82cd0ad1a0fc633c6d59c2cb8aad7 37422f7df389f3ae5a enterAndClear "device/qcom/sepolicy"; patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/0001-Camera_Fix.patch"; #Fix camera on -user builds XXX: REMOVE THIS TRASH +if [ "$(type -t DOS_WEBVIEW_CHERRYPICK)" = "alias" ] ; then enterAndClear "external/chromium-webview"; -git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/60/312860/1; #update webview +DOS_WEBVIEW_CHERRYPICK; #update webview +fi; enterAndClear "external/svox"; git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index faf7d99d..c28a366b 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -72,8 +72,10 @@ enterAndClear "device/qcom/sepolicy-legacy"; patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy-legacy/0001-Camera_Fix.patch"; #Fix camera on -user builds XXX: REMOVE THIS TRASH echo "SELINUX_IGNORE_NEVERALLOWS := true" >> sepolicy.mk; #necessary for -user builds of legacy devices +if [ "$(type -t DOS_WEBVIEW_CHERRYPICK)" = "alias" ] ; then enterAndClear "external/chromium-webview"; -git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/60/312860/1; #update webview +DOS_WEBVIEW_CHERRYPICK; #update webview +fi; enterAndClear "external/svox"; git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh index 48287098..90c8c2a4 100644 --- a/Scripts/LineageOS-17.1/Patch.sh +++ b/Scripts/LineageOS-17.1/Patch.sh @@ -69,8 +69,10 @@ enterAndClear "device/qcom/sepolicy-legacy"; patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy-legacy/0001-Camera_Fix.patch"; #Fix camera on -user builds XXX: REMOVE THIS TRASH echo "SELINUX_IGNORE_NEVERALLOWS := true" >> sepolicy.mk; #necessary for -user builds of legacy devices +if [ "$(type -t DOS_WEBVIEW_CHERRYPICK)" = "alias" ] ; then enterAndClear "external/chromium-webview"; -git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/60/312860/1; #update webview +DOS_WEBVIEW_CHERRYPICK; #update webview +fi; enterAndClear "external/svox"; git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles diff --git a/Scripts/LineageOS-18.1/Patch.sh b/Scripts/LineageOS-18.1/Patch.sh index c7bf35b7..d08ab9fa 100644 --- a/Scripts/LineageOS-18.1/Patch.sh +++ b/Scripts/LineageOS-18.1/Patch.sh @@ -64,8 +64,10 @@ enterAndClear "device/qcom/sepolicy-legacy"; patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy-legacy/0001-Camera_Fix.patch"; #Fix camera on -user builds XXX: REMOVE THIS TRASH echo "SELINUX_IGNORE_NEVERALLOWS := true" >> sepolicy.mk; #necessary for -user builds of legacy devices +if [ "$(type -t DOS_WEBVIEW_CHERRYPICK)" = "alias" ] ; then enterAndClear "external/chromium-webview"; -git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/60/312860/1; #update webview +DOS_WEBVIEW_CHERRYPICK; #update webview +fi; enterAndClear "frameworks/base"; hardenLocationConf services/core/java/com/android/server/location/gps_debug.conf; diff --git a/Scripts/init.sh b/Scripts/init.sh index 7b70b9ae..3c1372c6 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -61,9 +61,10 @@ export DOS_MICROG_INCLUDED="NLP"; #Determines inclusion of microG. Options: NLP, export DOS_NON_COMMERCIAL_USE_PATCHES=false; #Set true to allow inclusion of non-commercial use patches XXX: Unused, see 1dc9247 export DOS_OPTIMIZE_IMAGES=false; #Set true to apply lossless optimizations to image resources export DOS_STRONG_ENCRYPTION_ENABLED=false; #Set true to enable AES 256-bit FDE encryption on 14.1+15.1 XXX: THIS WILL **DESTROY** EXISTING INSTALLS! +alias DOS_WEBVIEW_CHERRYPICK='git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/60/312860/2'; #Servers -export DOS_DEFAULT_DNS_PRESET="Cloudflare-BL"; #Sets default DNS. Options: See changeDefaultDNS() in Scripts/Common/Functions.sh +export DOS_DEFAULT_DNS_PRESET="Quad9"; #Sets default DNS. Options: See changeDefaultDNS() in Scripts/Common/Functions.sh export DOS_GPS_NTP_SERVER="2.android.pool.ntp.org"; #Options: Any NTP pool export DOS_GPS_SUPL_HOST="supl.google.com"; #Options: supl.{google,vodafone,sonyericsson}.com