Archives/NanoDroid
2
0
Fork 0
mirror of https://gitlab.com/Nanolx/NanoDroid synced 2024-10-31 09:20:23 +00:00
Code Issues Projects Releases Wiki Activity

support switching in-place between NanoDroid and Official microG GmsCore

Browse Source
This commit is contained in:
Christopher Roy Bratusek 2019-07-01 19:13:28 +02:00
parent 2cdef37a9d
commit 93073faafb
1 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
CommonInstaller
View File

@ -328,6 +328,40 @@ detect_mode () {
NANODROID_BINDIR="${MODPATH}/system/xbin"
}
detect_migrate_microg () {
gmscore_update=$(find /data/app -type d -name 'com.google.android.gms*')
GMSCORE_UPDATE=0
if [! -z ${gmscore_update} ]; then
if ${UNZIP} -l "${gmscore_update}/base.apk" | grep META-INF/NANOLX.RSA; then
echo " + NanoDroid microG GmsCore installed in /data/app"
GMSCORE_UPDATE=1
elif ${UNZIP} -l "${gmscore_update}/base.apk" | grep microg; then
echo " + Official microG GmsCore installed in /data/app"
GMSCORE_UPDATE=2
else
# should never be reached as we call the helper functions
# gapps_solve_conflicts() and gapps_destroy_artifacts()
# before detect_migrate_microg() when NANODROID_UPGRADE=0
echo " + Stock GApps GmsCore installed in /data/app"
GMSCORE_UPDATE=3
fi
else
GMSCORE_UPDATE=0
fi
if [ "${nanodroid_gmscore}" -eq 1 && "${GMSCORE_UPDATE}" -eq 1 ]; then
echo " + Removing NanoDroid microG GmsCore in favor of Official microG GmsCore"
rm -rf "${gmscore_update}"
elif [ "${nanodroid_gmscore}" -eq 0 && "${GMSCORE_UPDATE}" -eq 2 ]; then
echo " + Removing Official microG GmsCore in favor of NanoDroid microG GmsCore"
rm -rf "${gmscore_update}"
elif [ "${GMSCORE_UPDATE}" -eq 3 ]; then
echo " + Removing GApps GmsCore [XXX who did we end up here?]"
rm -rf "${gmscore_update}"
fi
}
unpack_zip () {
TMPDIR=/dev/tmp
TMP_LIBDIR=${TMPDIR}/nanodroid-lib
@ -873,6 +907,8 @@ install_microg () {
ui_print " ++ Radiocell location backend"
fi
detect_migrate_microg
if [ "${nanodroid_gmscore}" -eq 1 ]; then
ui_print " ++ Official microG GmsCore"
nanodroid_install_apk GmsCore_Official "" GmsCore