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

CommonAddon: honour nanodroid_overlay setup variale

This commit is contained in:
Christopher Roy Bratusek 2018-10-06 21:05:41 +02:00
parent eea524d8a5
commit e42c7aadaf
2 changed files with 28 additions and 3 deletions

View File

@ -12,6 +12,9 @@
* improve dalvikvm arch detection * improve dalvikvm arch detection
* should improve ROM compatibility * should improve ROM compatibility
* CommonAddon
* addon.d now properly honours `nanodroid_overlay` setup variable
* Full, microG packages * Full, microG packages
* switch to official Fake Store build * switch to official Fake Store build
* fixes F-Droid repository conflict with custom Play Store * fixes F-Droid repository conflict with custom Play Store

View File

@ -60,6 +60,21 @@ com.qualcomm.location
org.microg.nlp org.microg.nlp
org.microg.unifiednlp" org.microg.unifiednlp"
# check for configuration files
config_locations="/sdcard /external_sd /data"
get_config () {
config=""
config_exists=0
for path in ${config_locations}; do
if test -r "${path}/.nanodroid-${1}"; then
config="${path}/.nanodroid-${1}"
config_exists=1
return
fi
done
}
if [ ! -d /system/xbin ]; then if [ ! -d /system/xbin ]; then
NANODROID_BINDIR=/system/bin NANODROID_BINDIR=/system/bin
else NANODROID_BINDIR=/system/xbin else NANODROID_BINDIR=/system/xbin
@ -190,9 +205,16 @@ postrestore_action () {
done done
ui_print " ++ ${MODID} addon.d: GApps removal done" ui_print " ++ ${MODID} addon.d: GApps removal done"
ui_print " ++ ${MODID} addon.d: creating Overlays"
${NANODROID_BINDIR}/nanodroid-overlay --create get_config setup
ui_print " ++ ${MODID} addon.d: creating Overlays done" if [ "${config_exists}" -eq 1 ]; then
source "${config}"
if [ "${nanodroid_overlay}" -eq 1 ]; then
ui_print " ++ ${MODID} addon.d: creating Overlays"
${NANODROID_BINDIR}/nanodroid-overlay --create
ui_print " ++ ${MODID} addon.d: creating Overlays done"
fi
fi
export PATH=${OLD_PATH} export PATH=${OLD_PATH}
export LD_LIBRARY_PATH=${OLD_LD} export LD_LIBRARY_PATH=${OLD_LD}