diff --git a/Bromite/module.prop b/Bromite/module.prop deleted file mode 100644 index 907e009..0000000 --- a/Bromite/module.prop +++ /dev/null @@ -1,7 +0,0 @@ -id=NanoDroid_Bromite -name=NanoDroid (Bromite sub module) -version=v19.2.99999999 -versionCode=1 -author=Nanolx -description=NanoDroid (Bromite sub module) -minMagisk=1500 diff --git a/Bromite/META-INF/com/google/android/update-binary b/BromiteWebView/META-INF/com/google/android/update-binary similarity index 94% rename from Bromite/META-INF/com/google/android/update-binary rename to BromiteWebView/META-INF/com/google/android/update-binary index 1f993ae..fcb9eb2 100644 --- a/Bromite/META-INF/com/google/android/update-binary +++ b/BromiteWebView/META-INF/com/google/android/update-binary @@ -5,7 +5,7 @@ OUTFD=${2} ZIP=${3} ZIPDIR=$(dirname "${ZIP}") -MODID=NanoDroid_Bromite +MODID=NanoDroid_BromiteWebView mkdir -p /dev/tmp unzip -o "${ZIP}" CommonInstaller -d "/dev/tmp" diff --git a/Bromite/META-INF/com/google/android/updater-script b/BromiteWebView/META-INF/com/google/android/updater-script similarity index 100% rename from Bromite/META-INF/com/google/android/updater-script rename to BromiteWebView/META-INF/com/google/android/updater-script diff --git a/BromiteWebView/module.prop b/BromiteWebView/module.prop new file mode 100644 index 0000000..7707c80 --- /dev/null +++ b/BromiteWebView/module.prop @@ -0,0 +1,7 @@ +id=NanoDroid_BromiteWebView +name=NanoDroid (Bromite WebView sub module) +version=v19.2.99999999 +versionCode=1 +author=Nanolx +description=NanoDroid (Bromite WebView sub module) +minMagisk=1500 diff --git a/CommonInstaller b/CommonInstaller index 3fb08b7..1f3a55c 100644 --- a/CommonInstaller +++ b/CommonInstaller @@ -957,6 +957,28 @@ install_initd () { fi } +install_bromite_webview () { + if [ "${MODID}" = "NanoDroid_BromiteWebView" ]; then + case ${ARCH} in + arm | arm64 | x86 ) BROMITE_ARCH=${ARCH} ;; + x86_64 ) BROMITE_ARCH=x86 ;; + esac + + if [ -d /system/app/webview ]; then + if [ "${MODE}" = "MAGISK" ]; then + mkdir -p "${MODPATH}/system/app/webview" + touch "${MODPATH}/system/app/webview/.replace" + else + mkdir -p /sdcard/nanodroid_backups/app + rm -rf /sdcard/nanodroid_backups/app/webview + mv /system/app/webview /sdcard/nanodroid_backups/app/ + fi + fi + + nanodroid_install_apk BromiteWebView_${BROMITE_ARCH} + fi +} + install_swipe () { if [ "${nanodroid_swipe}" ]; then if [ "${SWIPE_UNSUPPORTED}" -eq 1 ]; then diff --git a/build-package b/build-package index fea75f3..96a9d45 100755 --- a/build-package +++ b/build-package @@ -50,6 +50,10 @@ for opt in ${@}; do mk_pkg_setupwizard ;; + bromitewebview ) + mkg_pkg_bromite_webview + ;; + all ) check_nanodroid || error "run nanodroid-pull first!" mk_pkg_full @@ -58,6 +62,7 @@ for opt in ${@}; do mk_pkg_patcher mk_pkg_uninstaller mk_pkg_setupwizard + mk_pkg_bromite_webview ;; ver ) diff --git a/data/build-package.common b/data/build-package.common index d832c1a..98b35db 100644 --- a/data/build-package.common +++ b/data/build-package.common @@ -72,7 +72,7 @@ increase_version_number() { sed -e "s/^VERSION=.*/VERSION=${2}.${ver}/" -i "${CWD}/build-package" sed -e "s/^VERSION=.*/VERSION=${2}.${ver}/" -i "${CWD}/CommonInstaller" - for module in Full microG F-Droid; do + for module in Full microG F-Droid BromiteWebView; do sed -e "s/version=.*/version=v${2}.${ver}/" -i \ "${CWD}/${module}/module.prop" done @@ -141,6 +141,7 @@ create zip files: patcher | create framework patcher zip from repo uninstaller | create uninstaller zip from repo setupwizard | create setup-wizard zip from repo + bromitewebview | create Bromite WebView zip from repo all | create all zips from repo misc. stuff: diff --git a/data/build-package.database b/data/build-package.database index 7e9fcbe..9e48aa9 100644 --- a/data/build-package.database +++ b/data/build-package.database @@ -172,6 +172,6 @@ files_database=( Full/gsync/K/app/GoogleCalendarSync/GoogleCalendarSync.apk Full/system/priv-app/FakeStore/FakeStore.apk Full/system/priv-app/YalpStore/YalpStore.apk Full/system/priv-app/GsfProxy/GsfProxy.apk - Bromite/system/app/BromiteWebView_arm/BromiteWebView_arm.apk - Bromite/system/app/BromiteWebView_arm64/BromiteWebView_arm64.apk - Bromite/system/app/BromiteWebView_x86/BromiteWebView_x86.apk ) + BromiteWebView/system/app/BromiteWebView_arm/BromiteWebView_arm.apk + BromiteWebView/system/app/BromiteWebView_arm64/BromiteWebView_arm64.apk + BromiteWebView/system/app/BromiteWebView_x86/BromiteWebView_x86.apk ) diff --git a/data/build-package.download b/data/build-package.download index 143823c..6238129 100644 --- a/data/build-package.download +++ b/data/build-package.download @@ -85,7 +85,7 @@ grab_apk_from_repo () { APK_URL="${REPO}/${APK_NAME}" if [ "${1}" = "bromite" ]; then - APK_DEST="${CWD}/Bromite/system/${3}/${4}" + APK_DEST="${CWD}/BromiteWebView/system/${3}/${4}" else APK_DEST="${CWD}/Full/system/${3}/${4}" fi