diff --git a/Manifests/Manifest_LAOS-11.0.xml b/Manifests/Manifest_LAOS-11.0.xml index 4c73c8f9..b28734a2 100644 --- a/Manifests/Manifest_LAOS-11.0.xml +++ b/Manifests/Manifest_LAOS-11.0.xml @@ -69,4 +69,3 @@ - diff --git a/Manifests/Manifest_LAOS-14.1.xml b/Manifests/Manifest_LAOS-14.1.xml index c9542b9a..26b86432 100644 --- a/Manifests/Manifest_LAOS-14.1.xml +++ b/Manifests/Manifest_LAOS-14.1.xml @@ -253,20 +253,6 @@ - - - - - - - - - - - - - - diff --git a/Manifests/Manifest_LAOS-15.1.xml b/Manifests/Manifest_LAOS-15.1.xml index 9292cbc3..2c03d1ee 100644 --- a/Manifests/Manifest_LAOS-15.1.xml +++ b/Manifests/Manifest_LAOS-15.1.xml @@ -189,20 +189,6 @@ --> - - - - - - - - - - - - - - diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 0cfbcee4..ca61589d 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -55,7 +55,7 @@ buildAll() { brunch lineage_clark-user; brunch lineage_FP2-user; #brunch lineage_grouper-user; #builds, but requires out-of-tree blobs - brunch lineage_h815-user; #deprecated (UPSTREAM) drivers/input/touchscreen/DS5/RefCode_CustomerImplementation.c:147:1: warning: the frame size of 2064 bytes is larger than 2048 bytes + brunch lineage_h815-user; #deprecated brunch lineage_herolte-user; #deprecated brunch lineage_himaul-user; #deprecated brunch lineage_i9100-userdebug; diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index a18ffb0f..b6128c28 100755 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -42,7 +42,8 @@ #Download some (non-executable) out-of-tree files for use later on mkdir /tmp/ar; cd /tmp/ar; -if [ "$HOSTS_BLOCKING" = true ]; then wget https://spotco.us/hosts -N; fi; #XXX: /hosts is built from non-commercial use files, switch to /hsc for release +if [ "$HOSTS_BLOCKING" = true ]; then wget "$HOSTS_BLOCKING_LIST" -N; fi; +cd "$base"; #Accept all SDK licences, not normally needed but Gradle managed apps fail without it mkdir -p "$ANDROID_HOME/licenses"; diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index b845070b..8591cd4b 100755 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -42,7 +42,8 @@ #Download some (non-executable) out-of-tree files for use later on mkdir /tmp/ar; cd /tmp/ar; -if [ "$HOSTS_BLOCKING" = true ]; then wget https://spotco.us/hosts -N; fi; #XXX: /hosts is built from non-commercial use files, switch to /hsc for release +if [ "$HOSTS_BLOCKING" = true ]; then wget "$HOSTS_BLOCKING_LIST" -N; fi; +cd "$base"; #Accept all SDK licences, not normally needed but Gradle managed apps fail without it mkdir -p "$ANDROID_HOME/licenses"; @@ -229,7 +230,7 @@ echo "allow wcnss_service block_device:dir search;" >> sepolicy/wcnss_service.te echo "/dev/block/platform/msm_sdcc\.1/by-name/pad u:object_r:misc_block_device:s0" >> sepolicy/file_contexts; #fix uncrypt denial enterAndClear "device/lge/mako"; -cp "$patches/android_device_lge_mako/proprietary-blobs.txt" proprietary-blobs.txt; #update that? nah +cp "$patches/android_device_lge_mako/proprietary-blobs.txt" proprietary-blobs.txt; #Out of sync echo "allow kickstart usbfs:dir search;" >> sepolicy/kickstart.te; #Fix forceencrypt on first boot patch -p1 < "$patches/android_device_lge_mako/0001-Enable_LTE.patch"; diff --git a/Scripts/init.sh b/Scripts/init.sh index ec4c7208..26a845e6 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -29,6 +29,7 @@ export MALWARE_SCAN_ENABLED=true; #Set true to perform a fast scan on patchWorks export MALWARE_SCAN_SETTING="quick"; #buildAll() scan speed. Options: quick, extra, slow, full export MICROG_INCLUDED="NLP"; #Determines inclusion of microG. Options: NONE, NLP, FULL export HOSTS_BLOCKING=true; #Switch to false to prevent inclusion of our HOSTS file +export HOSTS_BLOCKING_LIST="https://spotco.us/hosts"; #Must be in the format "127.0.0.0 bad.domain.tld". XXX: /hosts is built from non-commercial use files, switch to /hsc for release export OVERCLOCKS_ENABLED=true; #Switch to false to disable overclocks export STRONG_ENCRYPTION_ENABLED=false; #Switch to true to enable AES-256bit encryption XXX: THIS WILL **DESTROY** EXISTING INSTALLS! export NON_COMMERCIAL_USE_PATCHES=false; #Switch to false to prevent inclusion of non-commercial use patches