mirror of
https://gitlab.com/Nanolx/NanoDroid
synced 2024-10-31 09:20:23 +00:00
break-out Google Sync Adapters and Swipe Libraries into NanoDroid-Google package
This commit is contained in:
parent
e37d2fc3c2
commit
3da72ba0a8
@ -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
|
||||
|
@ -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
|
||||
;;
|
||||
|
||||
|
@ -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
|
||||
|
@ -1,20 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<exceptions>
|
||||
<exception package="com.google.android.backuptransport">
|
||||
<permission name="android.permission.READ_CONTACTS" fixed="false"></permission>
|
||||
<permission name="android.permission.WRITE_CONTACTS" fixed="false"></permission>
|
||||
<permission name="android.permission.GET_ACCOUNTS" fixed="false"></permission>
|
||||
</exception>
|
||||
|
||||
<exception package="com.google.android.syncadapters.contacts">
|
||||
<permission name="android.permission.READ_CONTACTS" fixed="false"></permission>
|
||||
<permission name="android.permission.WRITE_CONTACTS" fixed="false"></permission>
|
||||
<permission name="android.permission.GET_ACCOUNTS" fixed="false"></permission>
|
||||
<permission name="com.google.android.googleapps.permission.GOOGLE_AUTH.cp" fixed="false"/>
|
||||
</exception>
|
||||
|
||||
<exception package="com.google.android.syncadapters.calendar">
|
||||
<permission name="android.permission.READ_CALENDAR" fixed="false"></permission>
|
||||
<permission name="android.permission.WRITE_CALENDAR" fixed="false"></permission>
|
||||
</exception>
|
||||
</exceptions>
|
1
Google/ChangeLog.md
Symbolic link
1
Google/ChangeLog.md
Symbolic link
@ -0,0 +1 @@
|
||||
../tools/ChangeLog.md
|
1
Google/CommonAddon
Symbolic link
1
Google/CommonAddon
Symbolic link
@ -0,0 +1 @@
|
||||
../CommonAddon
|
1
Google/CommonInstaller
Symbolic link
1
Google/CommonInstaller
Symbolic link
@ -0,0 +1 @@
|
||||
../CommonInstaller
|
51
Google/META-INF/com/google/android/update-binary
Normal file
51
Google/META-INF/com/google/android/update-binary
Normal file
@ -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
|
1
Google/META-INF/com/google/android/updater-script
Normal file
1
Google/META-INF/com/google/android/updater-script
Normal file
@ -0,0 +1 @@
|
||||
#MAGISK
|
1
Google/README.md
Symbolic link
1
Google/README.md
Symbolic link
@ -0,0 +1 @@
|
||||
../tools/README.md
|
1
Google/aapt.arm
Symbolic link
1
Google/aapt.arm
Symbolic link
@ -0,0 +1 @@
|
||||
../tools/aapt.arm
|
1
Google/aapt.x86
Symbolic link
1
Google/aapt.x86
Symbolic link
@ -0,0 +1 @@
|
||||
../tools/aapt.x86
|
1
Google/busybox.arm
Symbolic link
1
Google/busybox.arm
Symbolic link
@ -0,0 +1 @@
|
||||
../tools/busybox.arm
|
1
Google/busybox.x86
Symbolic link
1
Google/busybox.x86
Symbolic link
@ -0,0 +1 @@
|
||||
../tools/busybox.x86
|
7
Google/module.prop
Normal file
7
Google/module.prop
Normal file
@ -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
|
1
Google/service.sh
Symbolic link
1
Google/service.sh
Symbolic link
@ -0,0 +1 @@
|
||||
../tools/service.sh
|
1
Google/unzip.arm
Symbolic link
1
Google/unzip.arm
Symbolic link
@ -0,0 +1 @@
|
||||
../tools/unzip.arm
|
1
Google/unzip.x86
Symbolic link
1
Google/unzip.x86
Symbolic link
@ -0,0 +1 @@
|
||||
../tools/unzip.x86
|
@ -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
|
||||
;;
|
||||
|
||||
|
@ -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:
|
||||
|
@ -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 $!
|
||||
}
|
||||
|
@ -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
|
||||
|
@ -1 +0,0 @@
|
||||
../Full/gsync
|
@ -1 +0,0 @@
|
||||
../Full/swipe
|
Loading…
Reference in New Issue
Block a user