From 826949e6df4ac167e1a39b34ed7d258beb96df5c Mon Sep 17 00:00:00 2001 From: Tad Date: Sat, 22 Aug 2020 10:13:25 -0400 Subject: [PATCH] Small updates --- Manifests/Manifest_LAOS-16.0.xml | 2 +- Patches/Common/android_vendor_divested/packages.mk | 2 +- Patches/Linux | 2 +- PrebuiltApps | 2 +- Scripts/LineageOS-15.1/Functions.sh | 1 - Scripts/LineageOS-17.1/Patch.sh | 1 - Scripts/init.sh | 2 +- 7 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Manifests/Manifest_LAOS-16.0.xml b/Manifests/Manifest_LAOS-16.0.xml index 3ac1ed30..36dfd066 100644 --- a/Manifests/Manifest_LAOS-16.0.xml +++ b/Manifests/Manifest_LAOS-16.0.xml @@ -113,7 +113,7 @@ - + diff --git a/Patches/Common/android_vendor_divested/packages.mk b/Patches/Common/android_vendor_divested/packages.mk index c1f1d239..d7e824b7 100644 --- a/Patches/Common/android_vendor_divested/packages.mk +++ b/Patches/Common/android_vendor_divested/packages.mk @@ -26,6 +26,6 @@ PRODUCT_PACKAGES += \ # Notes # - Available (via PrebuiltApps submodule): K9Mail, NetMonitor, OpenKeychain, Orbot, Shelter, TalkBack, TorBrowser # - Camera Choices: None (Camera2/Snap), OpenCamera -# - Gallery Choices: None (AOSP/Lineage), CameraRoll, SimpleGallery +# - Gallery Choices: None (AOSP/Lineage), SimpleGallery # - OpenKeychain inclusion is undecided yet # - Orbot/TorBrowser will most likely never be included due to various reasons diff --git a/Patches/Linux b/Patches/Linux index 4fd4de1e..88a1dd1d 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 4fd4de1ec26b13b21d5ca3a36f1fe3a3a1c148db +Subproject commit 88a1dd1db25f2cf5cb6bf089b72d03a472e037c7 diff --git a/PrebuiltApps b/PrebuiltApps index 66dfba90..775a542a 160000 --- a/PrebuiltApps +++ b/PrebuiltApps @@ -1 +1 @@ -Subproject commit 66dfba90dd5e729b993eae5df7e96835351a88e7 +Subproject commit 775a542adda3d79a33279c9c236bd78d2c324d28 diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index c9238f32..d0560b7a 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -106,7 +106,6 @@ patchWorkspace() { source build/envsetup.sh; repopick -i 282389; #update webview - repopick -it O_asb_2020-08; export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh index 59092fa5..78f68573 100644 --- a/Scripts/LineageOS-17.1/Patch.sh +++ b/Scripts/LineageOS-17.1/Patch.sh @@ -176,7 +176,6 @@ awk -i inplace '!/true cannot be used in user builds/' Android.mk; #Allow ignori enterAndClear "vendor/lineage"; rm build/target/product/security/lineage.x509.pem; rm -rf overlay/common/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml; #Remove analytics -rm -rf verity_tool; #Resurrect dm-verity rm -rf overlay/common/frameworks/base/core/res/res/drawable-*/default_wallpaper.png; if [ "$DOS_HOSTS_BLOCKING" = true ]; then awk -i inplace '!/50-lineage.sh/' config/*.mk; fi; #Make sure our hosts is always used awk -i inplace '!/PRODUCT_EXTRA_RECOVERY_KEYS/' config/*.mk; #Remove extra keys diff --git a/Scripts/init.sh b/Scripts/init.sh index 8a7f9845..6f804253 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -52,7 +52,7 @@ export DOS_GPS_GLONASS_FORCED=false; #Enables GLONASS on all devices export DOS_GRAPHENE_MALLOC=true; #Enables use of GrapheneOS' hardened memory allocator on 64-bit platforms export DOS_GRAPHENE_EXEC=true; #Enables use of GrapheneOS' exec spawning feature export DOS_HOSTS_BLOCKING=true; #Switch to false to prevent inclusion of our HOSTS file -export DOS_HOSTS_BLOCKING_APP="DNS66"; #App installed when built-in blocking is disabled. Options: Blokada, DNS66 +export DOS_HOSTS_BLOCKING_APP="DNS66"; #App installed when built-in blocking is disabled. Options: DNS66 export DOS_HOSTS_BLOCKING_LIST="https://divestos.org/hosts"; #Must be in the format "127.0.0.1 bad.domain.tld" export DOS_LOWRAM_ENABLED=false; #Switch to true to enable low_ram on all devices export DOS_MICROG_INCLUDED="NLP"; #Determines inclusion of microG. Options: NONE, NLP, FULL