From 870382ff4078a3d5bd8ce3ceb752edf1b586bf20 Mon Sep 17 00:00:00 2001 From: Tad Date: Sat, 2 Oct 2021 01:43:18 -0400 Subject: [PATCH] Switch to the Mulch WebView Signed-off-by: Tad --- Manifests/Manifest_LAOS-14.1.xml | 6 ++++++ Manifests/Manifest_LAOS-15.1.xml | 6 ++++++ Manifests/Manifest_LAOS-16.0.xml | 6 ++++++ Manifests/Manifest_LAOS-17.1.xml | 6 ++++++ Manifests/Manifest_LAOS-18.1.xml | 6 ++++++ Scripts/LineageOS-14.1/Patch.sh | 5 ++--- Scripts/LineageOS-15.1/Patch.sh | 5 ++--- Scripts/LineageOS-16.0/Patch.sh | 5 ++--- Scripts/LineageOS-17.1/Patch.sh | 5 ++--- Scripts/LineageOS-18.1/Patch.sh | 5 ++--- Scripts/init.sh | 3 ++- 11 files changed, 42 insertions(+), 16 deletions(-) diff --git a/Manifests/Manifest_LAOS-14.1.xml b/Manifests/Manifest_LAOS-14.1.xml index 5dfbcdb3..12e9fb70 100644 --- a/Manifests/Manifest_LAOS-14.1.xml +++ b/Manifests/Manifest_LAOS-14.1.xml @@ -1,6 +1,8 @@ + + @@ -60,6 +62,10 @@ + + + + diff --git a/Manifests/Manifest_LAOS-15.1.xml b/Manifests/Manifest_LAOS-15.1.xml index 3ac68d50..bf8b1890 100644 --- a/Manifests/Manifest_LAOS-15.1.xml +++ b/Manifests/Manifest_LAOS-15.1.xml @@ -1,6 +1,8 @@ + + @@ -62,6 +64,10 @@ + + + + diff --git a/Manifests/Manifest_LAOS-16.0.xml b/Manifests/Manifest_LAOS-16.0.xml index e389a606..a4e02454 100644 --- a/Manifests/Manifest_LAOS-16.0.xml +++ b/Manifests/Manifest_LAOS-16.0.xml @@ -1,6 +1,8 @@ + + @@ -60,6 +62,10 @@ + + + + diff --git a/Manifests/Manifest_LAOS-17.1.xml b/Manifests/Manifest_LAOS-17.1.xml index fc555192..60069187 100644 --- a/Manifests/Manifest_LAOS-17.1.xml +++ b/Manifests/Manifest_LAOS-17.1.xml @@ -1,6 +1,8 @@ + + @@ -58,6 +60,10 @@ + + + + diff --git a/Manifests/Manifest_LAOS-18.1.xml b/Manifests/Manifest_LAOS-18.1.xml index 97fdde18..97add592 100644 --- a/Manifests/Manifest_LAOS-18.1.xml +++ b/Manifests/Manifest_LAOS-18.1.xml @@ -1,6 +1,8 @@ + + @@ -62,6 +64,10 @@ + + + + diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index dec7e565..96fd1b33 100644 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -77,10 +77,9 @@ patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/248649.patch"; #msm_irqba patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/0001-Camera_Fix.patch"; #Fix camera on user builds XXX: REMOVE THIS TRASH fi; -if [ "$(type -t DOS_WEBVIEW_CHERRYPICK)" = "alias" ] ; then if enterAndClear "external/chromium-webview"; then -DOS_WEBVIEW_CHERRYPICK; #Update the WebView to latest if available -fi; +if [ "$(type -t DOS_WEBVIEW_CHERRYPICK)" = "alias" ] ; then DOS_WEBVIEW_CHERRYPICK; fi; #Update the WebView to latest if available +if [ "$DOS_WEBVIEW_LFS" = true ]; then git lfs pull; fi; #Ensure the objects are available fi; if enterAndClear "external/sqlite"; then diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index 39dccb74..1adbf214 100644 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -83,10 +83,9 @@ if enterAndClear "device/qcom/sepolicy"; then patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/0001-Camera_Fix.patch"; #Fix camera on -user builds XXX: REMOVE THIS TRASH fi; -if [ "$(type -t DOS_WEBVIEW_CHERRYPICK)" = "alias" ] ; then if enterAndClear "external/chromium-webview"; then -DOS_WEBVIEW_CHERRYPICK; #Update the WebView to latest if available -fi; +if [ "$(type -t DOS_WEBVIEW_CHERRYPICK)" = "alias" ] ; then DOS_WEBVIEW_CHERRYPICK; fi; #Update the WebView to latest if available +if [ "$DOS_WEBVIEW_LFS" = true ]; then git lfs pull; fi; #Ensure the objects are available fi; if enterAndClear "external/svox"; then diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index 57d68c5e..8ef1560d 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -82,10 +82,9 @@ patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy-legacy/0001-Camera_Fix.pa echo "SELINUX_IGNORE_NEVERALLOWS := true" >> sepolicy.mk; #Ignore neverallow violations XXX: necessary for -user builds of legacy devices fi; -if [ "$(type -t DOS_WEBVIEW_CHERRYPICK)" = "alias" ] ; then if enterAndClear "external/chromium-webview"; then -DOS_WEBVIEW_CHERRYPICK; #Update the WebView to latest if available -fi; +if [ "$(type -t DOS_WEBVIEW_CHERRYPICK)" = "alias" ] ; then DOS_WEBVIEW_CHERRYPICK; fi; #Update the WebView to latest if available +if [ "$DOS_WEBVIEW_LFS" = true ]; then git lfs pull; fi; #Ensure the objects are available fi; if enterAndClear "external/svox"; then diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh index c1cb81d5..64937eb3 100644 --- a/Scripts/LineageOS-17.1/Patch.sh +++ b/Scripts/LineageOS-17.1/Patch.sh @@ -79,10 +79,9 @@ patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy-legacy/0001-Camera_Fix.pa echo "SELINUX_IGNORE_NEVERALLOWS := true" >> sepolicy.mk; #Ignore neverallow violations XXX: necessary for -user builds of legacy devices fi; -if [ "$(type -t DOS_WEBVIEW_CHERRYPICK)" = "alias" ] ; then if enterAndClear "external/chromium-webview"; then -DOS_WEBVIEW_CHERRYPICK; #Update the WebView to latest if available -fi; +if [ "$(type -t DOS_WEBVIEW_CHERRYPICK)" = "alias" ] ; then DOS_WEBVIEW_CHERRYPICK; fi; #Update the WebView to latest if available +if [ "$DOS_WEBVIEW_LFS" = true ]; then git lfs pull; fi; #Ensure the objects are available fi; if enterAndClear "external/svox"; then diff --git a/Scripts/LineageOS-18.1/Patch.sh b/Scripts/LineageOS-18.1/Patch.sh index ba1c8f14..d4459e5a 100644 --- a/Scripts/LineageOS-18.1/Patch.sh +++ b/Scripts/LineageOS-18.1/Patch.sh @@ -73,10 +73,9 @@ patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy-legacy/0001-Camera_Fix.pa echo "SELINUX_IGNORE_NEVERALLOWS := true" >> sepolicy.mk; #Ignore neverallow violations XXX: necessary for -user builds of legacy devices fi; -if [ "$(type -t DOS_WEBVIEW_CHERRYPICK)" = "alias" ] ; then if enterAndClear "external/chromium-webview"; then -DOS_WEBVIEW_CHERRYPICK; #Update the WebView to latest if available -fi; +if [ "$(type -t DOS_WEBVIEW_CHERRYPICK)" = "alias" ] ; then DOS_WEBVIEW_CHERRYPICK; fi; #Update the WebView to latest if available +if [ "$DOS_WEBVIEW_LFS" = true ]; then git lfs pull; fi; #Ensure the objects are available fi; if enterAndClear "frameworks/base"; then diff --git a/Scripts/init.sh b/Scripts/init.sh index ceb33c47..02c1604b 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -61,7 +61,8 @@ 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/00/316600/2'; +export DOS_WEBVIEW_LFS=true; #Whether to `git lfs pull` in the WebView repository +#alias DOS_WEBVIEW_CHERRYPICK='git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/00/316600/2'; #Servers export DOS_DEFAULT_DNS_PRESET="Quad9"; #Sets default DNS. Options: See changeDefaultDNS() in Scripts/Common/Functions.sh