diff --git a/ChangeLog.md b/ChangeLog.md index 0c5820e6..ed81fc7d 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -31,6 +31,13 @@ * look * setterm * no longer ship Zelda ringtones + * break-out Google Sync Adapters and Swipe libraries into NanoDroid-Google package + +* microG package + * break-out Google Sync Adapters and Swipe libraries into NanoDroid-Google package + +* Google package + * new package which includes Google Sync and Swipe libraries * Patcher * for SDK 19 - 25 use dexpatcher 1.6.3 diff --git a/CommonInstaller b/CommonInstaller index da167fe0..c9f3df25 100644 --- a/CommonInstaller +++ b/CommonInstaller @@ -199,6 +199,9 @@ show_banner () { NanoDroid_OsmAnd ) ui_print " > OsmAnd package " ;; + NanoDroid_Google ) + ui_print " > Google package " + ;; esac if [ "${ZIP}" == *${VERSION}* ]; then @@ -667,7 +670,7 @@ magisk_install_setup () { error "${MODID} can't be installed on Android 10 or newer" ;; - NanoDroid_OsmAnd ) + NanoDroid_OsmAnd | NanoDroid_Google ) true ;; diff --git a/Full/META-INF/com/google/android/update-binary b/Full/META-INF/com/google/android/update-binary index 5a9e025f..abcb9fd0 100644 --- a/Full/META-INF/com/google/android/update-binary +++ b/Full/META-INF/com/google/android/update-binary @@ -42,7 +42,6 @@ set_progress 0.3 install_nanodroidscripts install_microg install_mapsv1 -install_gsync install_fdroid install_store set_progress 0.5 @@ -51,7 +50,6 @@ install_apps set_progress 0.75 install_initd -install_swipe install_bash install_shell_utils set_progress 0.9 diff --git a/Full/gsync/etc/default-permissions/google-sync-permissions.xml b/Full/gsync/etc/default-permissions/google-sync-permissions.xml deleted file mode 100644 index fe8b9f6a..00000000 --- a/Full/gsync/etc/default-permissions/google-sync-permissions.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/Google/ChangeLog.md b/Google/ChangeLog.md new file mode 120000 index 00000000..1c066bbe --- /dev/null +++ b/Google/ChangeLog.md @@ -0,0 +1 @@ +../tools/ChangeLog.md \ No newline at end of file diff --git a/Google/CommonAddon b/Google/CommonAddon new file mode 120000 index 00000000..10db8391 --- /dev/null +++ b/Google/CommonAddon @@ -0,0 +1 @@ +../CommonAddon \ No newline at end of file diff --git a/Google/CommonInstaller b/Google/CommonInstaller new file mode 120000 index 00000000..cfa899ac --- /dev/null +++ b/Google/CommonInstaller @@ -0,0 +1 @@ +../CommonInstaller \ No newline at end of file diff --git a/Google/META-INF/com/google/android/update-binary b/Google/META-INF/com/google/android/update-binary new file mode 100644 index 00000000..a57b1aa0 --- /dev/null +++ b/Google/META-INF/com/google/android/update-binary @@ -0,0 +1,51 @@ +#!/sbin/sh + +umask 022 +OUTFD=${2} +ZIP=${3} + +ZIPDIR=$(dirname "${ZIP}") +MODID=NanoDroid_Google + +mkdir -p /dev/tmp +unzip -oq "${ZIP}" CommonInstaller -d "/dev/tmp" +if [ ! -f /dev/tmp/CommonInstaller ]; then + echo " !! failed to load Common Installer" + exit 1 +else + source "/dev/tmp/CommonInstaller" +fi + +detect_bootmode +detect_outfd +#check_space +show_progress 1.0 0 + +show_banner +set_progress 0.1 + +unpack_zip +mount_partitions + +detect_arch +setup_busybox + +set_progress 0.2 + +get_cfg_setup +get_cfg_apps +get_cfg_overlay + +detect_mode +set_progress 0.3 + +install_gsync +set_progress 0.5 + +install_swipe +set_progress 0.9 + +nanodroid_finalize +set_progress 1.0 + +exit 0 diff --git a/Google/META-INF/com/google/android/updater-script b/Google/META-INF/com/google/android/updater-script new file mode 100644 index 00000000..11d5c96e --- /dev/null +++ b/Google/META-INF/com/google/android/updater-script @@ -0,0 +1 @@ +#MAGISK diff --git a/Google/README.md b/Google/README.md new file mode 120000 index 00000000..367c184a --- /dev/null +++ b/Google/README.md @@ -0,0 +1 @@ +../tools/README.md \ No newline at end of file diff --git a/Google/aapt.arm b/Google/aapt.arm new file mode 120000 index 00000000..ea99108d --- /dev/null +++ b/Google/aapt.arm @@ -0,0 +1 @@ +../tools/aapt.arm \ No newline at end of file diff --git a/Google/aapt.x86 b/Google/aapt.x86 new file mode 120000 index 00000000..f9ef550c --- /dev/null +++ b/Google/aapt.x86 @@ -0,0 +1 @@ +../tools/aapt.x86 \ No newline at end of file diff --git a/Google/busybox.arm b/Google/busybox.arm new file mode 120000 index 00000000..6636870c --- /dev/null +++ b/Google/busybox.arm @@ -0,0 +1 @@ +../tools/busybox.arm \ No newline at end of file diff --git a/Google/busybox.x86 b/Google/busybox.x86 new file mode 120000 index 00000000..fd122be2 --- /dev/null +++ b/Google/busybox.x86 @@ -0,0 +1 @@ +../tools/busybox.x86 \ No newline at end of file diff --git a/Google/module.prop b/Google/module.prop new file mode 100644 index 00000000..78a10dce --- /dev/null +++ b/Google/module.prop @@ -0,0 +1,7 @@ +id=NanoDroid +name=NanoDroid_Google +version=v22.5.1.20200102 +versionCode=79 +author=Nanolx +description=NanoDroid: Google Sync Adapters and Swipe libraries sub-module. +minMagisk=1900 diff --git a/Google/service.sh b/Google/service.sh new file mode 120000 index 00000000..287bbc8b --- /dev/null +++ b/Google/service.sh @@ -0,0 +1 @@ +../tools/service.sh \ No newline at end of file diff --git a/Google/unzip.arm b/Google/unzip.arm new file mode 120000 index 00000000..1dd493ca --- /dev/null +++ b/Google/unzip.arm @@ -0,0 +1 @@ +../tools/unzip.arm \ No newline at end of file diff --git a/Google/unzip.x86 b/Google/unzip.x86 new file mode 120000 index 00000000..316e38bb --- /dev/null +++ b/Google/unzip.x86 @@ -0,0 +1 @@ +../tools/unzip.x86 \ No newline at end of file diff --git a/build-package b/build-package index e62a2fc8..13e20b05 100755 --- a/build-package +++ b/build-package @@ -19,9 +19,9 @@ appsfolder[1]="${appsfolder[0]}/system" appsfolder[2]="${CWD}/${appsfolder[1]}" appsfolder[3]="${appsfolder[1]}/app" appsfolder[4]="${appsfolder[1]}/priv-app" -appsfolder[5]="${appsfolder[0]}/gsync" +appsfolder[5]="Google/gsync" appsfolder[6]="${CWD}/${appsfolder[5]}" -appsfolder[7]="${appsfolder[0]}/swipe" +appsfolder[7]="Google/swipe" appsfolder[8]="${CWD}/${appsfolder[7]}" appsfolder[9]="OsmAnd/system" appsfolder[10]="${CWD}/${appsfolder[9]}" @@ -78,6 +78,11 @@ for opt in ${@}; do mk_pkg_systest ;; + google ) + check_nanodroid || error "run 'build-package pull' first!" + mk_pkg_google + ;; + all ) check_nanodroid || error "run 'build-package pull' first!" mk_pkg_full @@ -89,6 +94,7 @@ for opt in ${@}; do mk_pkg_bromite_webview mk_pkg_osmand mk_pkg_systest + mk_pkg_google create_report ;; diff --git a/data/build-package.common b/data/build-package.common index 53ab540d..02ba0e65 100644 --- a/data/build-package.common +++ b/data/build-package.common @@ -159,7 +159,7 @@ increase_version_number () { sed -e "s/^version_code.*/version_code=${1}/g" -i "${CWD}/build-package" sed -e "s/^version_date.*/version_date=${date}/g" -i "${CWD}/build-package" - for module in Full microG FDroid BromiteWebView OsmAnd; do + for module in Full microG FDroid BromiteWebView OsmAnd Google; do sed -e "s/version=.*/version=v${1}.${date}/" -i \ "${CWD}/${module}/module.prop" done @@ -171,7 +171,7 @@ increase_version_number () { } increase_module_version () { - for module in Full microG FDroid BromiteWebView OsmAnd; do + for module in Full microG FDroid BromiteWebView OsmAnd Google; do eval $(grep versionCode "${CWD}/${module}/module.prop") local versionCode=$((versionCode+1)) sed -e "s/versionCode.*/versionCode=${versionCode}/" \ @@ -223,6 +223,7 @@ create zip files: setupwizard | create SetupWizard zip from repo bromitewebview | create Bromite WebView zip from repo osmand | create OsmAnd package zip from repo + google | create Google package zip from repo all | create all zips from repo misc. stuff: diff --git a/data/build-package.pkg b/data/build-package.pkg index 3c6c3cbc..3eb48505 100644 --- a/data/build-package.pkg +++ b/data/build-package.pkg @@ -139,3 +139,19 @@ mk_pkg_systest () { create_systest_package & progress $! } + +create_google_package () { + ZIP="NanoDroid-Google-${VERSION}.zip" + + print_package "Google" + + zip_add Google + zip_add_setup 0 + + sum_sign_package "${ZIP}" +} + +mk_pkg_google () { + create_google_package & + progress $! +} diff --git a/microG/META-INF/com/google/android/update-binary b/microG/META-INF/com/google/android/update-binary index 1b8b4d43..d96c0e5e 100644 --- a/microG/META-INF/com/google/android/update-binary +++ b/microG/META-INF/com/google/android/update-binary @@ -41,10 +41,6 @@ set_progress 0.6 install_mapsv1 install_store -set_progress 0.75 - -install_gsync -install_swipe set_progress 0.9 nanodroid_finalize diff --git a/microG/gsync b/microG/gsync deleted file mode 120000 index ca20e1e1..00000000 --- a/microG/gsync +++ /dev/null @@ -1 +0,0 @@ -../Full/gsync \ No newline at end of file diff --git a/microG/swipe b/microG/swipe deleted file mode 120000 index 3ec234dd..00000000 --- a/microG/swipe +++ /dev/null @@ -1 +0,0 @@ -../Full/swipe \ No newline at end of file