From 935795f5bb21f710433ed266150e235a8fc52c01 Mon Sep 17 00:00:00 2001 From: Tad Date: Thu, 4 Apr 2019 15:51:00 -0400 Subject: [PATCH] Minor tweaks --- Scripts/LineageOS-14.1/Functions.sh | 3 +++ Scripts/LineageOS-16.0/Functions.sh | 1 + Scripts/LineageOS-16.0/Patch.sh | 3 --- Scripts/init.sh | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 49e69004..711605d2 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -103,6 +103,9 @@ patchWorkspace() { repopick -it bt-sbc-hd-dualchannel-nougat; repopick 201113; #wifi country code fix repopick 244387 244388; #loopback fixes + repopick -it n-asb-2019-04; + + export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Defaults.sh"; diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index f36cd029..b414b61c 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -67,6 +67,7 @@ patchWorkspace() { repopick 244148; #log spam fix #repopick -it recovery-p; repopick 245252; #update webview + #repopick -it android-9.0.0_r35; source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Defaults.sh"; diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index bb9ed801..9f04c878 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -138,9 +138,6 @@ if [ "$DOS_MICROG_INCLUDED" = "FULL" ]; then sed -i 's/GSETTINGS_PROVIDER = "com enterAndClear "packages/apps/SetupWizard"; patch -p1 < "$DOS_PATCHES/android_packages_apps_SetupWizard/0001-Remove_Analytics.patch"; #Remove analytics -enterAndClear "packages/apps/Trebuchet"; -cp "$DOS_BUILD_BASE/vendor/divested/overlay/common/packages/apps/Trebuchet/res/xml/*.xml" res/xml/; #XXX: force override since overlay is broken (?) - enterAndClear "packages/apps/Updater"; patch -p1 < "$DOS_PATCHES_COMMON/android_packages_apps_Updater/0001-Server.patch"; #Switch to our server patch -p1 < "$DOS_PATCHES/android_packages_apps_Updater/0002-Tor_Support.patch"; #Add Tor support diff --git a/Scripts/init.sh b/Scripts/init.sh index aca165f7..6a8eb21c 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -23,7 +23,6 @@ export DOS_SIGNING_KEYS=$DOS_WORKSPACE_ROOT"Signing_Keys"; #export DOS_BINARY_PATCHER=""; #export DOS_TOR_WRAPPER="torsocks"; #Uncomment to perform select build operations over Tor -export DOS_BUILDALL_SUPERSEDED=false; #Set true to build superseded devices when running buildAll() export DOS_DEBLOBBER_REMOVE_ACCESSORIES=true; #Set false to allow use of external accessories export DOS_DEBLOBBER_REMOVE_AUDIOFX=true; #Set true to remove AudioFX export DOS_DEBLOBBER_REMOVE_GRAPHICS=false; #Set true to remove all graphics blobs and use SwiftShader CPU renderer #TODO: Needs work @@ -34,8 +33,9 @@ export DOS_DEBLOBBER_REMOVE_IPA=false; #Set true to remove all IPA blobs export DOS_DEBLOBBER_REMOVE_IR=false; #Set true to remove all IR blobs export DOS_DEBLOBBER_REPLACE_TIME=false; #Set true to replace Qualcomm Time Services with the open source Sony TimeKeep reimplementation #TODO: Needs work -export DOS_GRAPHENE_MALLOC=true; #Enables use of GrapheneOS' hardened memory allocator on 64-bit platforms +export DOS_BUILDALL_SUPERSEDED=false; #Set true to build superseded devices when running buildAll() export DOS_GPS_GLONASS_FORCED=true; #Enables GLONASS on all devices +export DOS_GRAPHENE_MALLOC=true; #Enables use of GrapheneOS' hardened memory allocator on 64-bit platforms 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_LIST="https://divestos.xyz/hosts"; #Must be in the format "127.0.0.1 bad.domain.tld"