2
0
mirror of https://gitlab.com/Nanolx/NanoDroid synced 2024-10-31 09:20:23 +00:00

CommonInstaller: first install microG, then backends

This commit is contained in:
Christopher Roy Bratusek 2020-09-27 18:21:10 +02:00
parent 2fb80af189
commit 91a41ab0e0

View File

@ -1053,6 +1053,19 @@ install_microg () {
gapps_solve_conflicts
gapps_destroy_artifacts
print_info " ++ microG GmsCore"
nanodroid_install_apk GmsCore
detect_migrate_apk com.google.android.gms GmsCore
if [ "${nanodroid_microg}" -ne 2 ]; then
for app in GsfProxy DroidGuard; do
nanodroid_install_apk ${app}
done
detect_migrate_apk org.microg.gms.droidguard DroidGuard
${NANODROID_BINDIR}/nanodroid-overlay --add GmsDroidGuard
fi
NLPBACKEND="nlpBackendNominatim"
print_info " << with microg"
@ -1084,19 +1097,6 @@ install_microg () {
print_info " ++ Radiocell location backend"
fi
print_info " ++ microG GmsCore"
nanodroid_install_apk GmsCore
detect_migrate_apk com.google.android.gms GmsCore
if [ "${nanodroid_microg}" -ne 2 ]; then
for app in GsfProxy DroidGuard; do
nanodroid_install_apk ${app}
done
detect_migrate_apk org.microg.gms.droidguard DroidGuard
${NANODROID_BINDIR}/nanodroid-overlay --add GmsDroidGuard
fi
for app in ${NLPBACKEND}; do
nanodroid_install_apk ${app}
done