mirror of
https://gitlab.com/Nanolx/NanoDroid
synced 2024-10-31 09:20:23 +00:00
more minor Android 11 changes
This commit is contained in:
parent
262e03fdae
commit
11f8017cf1
@ -221,9 +221,7 @@ is_mounted () {
|
||||
##########################################################################################
|
||||
|
||||
mount_partitions () {
|
||||
if ${BOOTMODE}; then
|
||||
build_props=$(find /system /system_root /vendor -type f -name build.prop)
|
||||
else
|
||||
if ! ${BOOTMODE}; then
|
||||
DEVICE_AB=FALSE
|
||||
VENDOR_COMPAT=FALSE
|
||||
SYSTEM_AS_ROOT=FALSE
|
||||
@ -278,23 +276,25 @@ mount_partitions () {
|
||||
ln -sf /system/vendor /vendor >/dev/null
|
||||
fi
|
||||
|
||||
build_props=$(find /system /system_root /vendor -type f -name build.prop)
|
||||
echo " "
|
||||
mount | sed -e '/magisk/d' | awk '{print $1 " on " $3 " params: " $6}'
|
||||
echo " "
|
||||
|
||||
echo " INFO: #8 [prop]"
|
||||
ls -l /system/*.prop
|
||||
|
||||
[ -d /system/apex ] && mount_apex
|
||||
fi
|
||||
|
||||
echo " "
|
||||
mount | sed -e '/magisk/d' | awk '{print $1 " on " $3 " params: " $6}'
|
||||
echo " "
|
||||
|
||||
echo " INFO: #8 [prop]"
|
||||
ls -l /system/*.prop
|
||||
|
||||
echo " INFO: #9 [build_props] ${build_props}"
|
||||
build_props=$(find /system /system_root /vendor -type f -name build.prop)
|
||||
[ -z "${build_props}" ] && error "failed to mount /system (unsupported A/B device?)"
|
||||
|
||||
[ -d /apex/com.android.art ] && export ANDROID_ART_ROOT=/apex/com.android.art
|
||||
export ANDROID_RUNTIME_ROOT=/apex/com.android.runtime
|
||||
if [ -d /apex/com.android.art ]; then
|
||||
export ANDROID_ART_ROOT=/apex/com.android.art
|
||||
export ANDROID_RUNTIME_ROOT=${ANDROID_ART_ROOT}
|
||||
elif [ -d /apex/com.android.runtime ]; then
|
||||
export ANDROID_RUNTIME_ROOT=/apex/com.android.runtime
|
||||
fi
|
||||
|
||||
export ANDROID_TZDATA_ROOT=/apex/com.android.tzdata
|
||||
export ANDROID_I18N_ROOT /apex/com.android.i18n
|
||||
|
@ -101,9 +101,7 @@ mount_apex () {
|
||||
|
||||
# taken from Magisk, with minor modifications for NanoDroid
|
||||
mount_partitions () {
|
||||
if ${BOOTMODE}; then
|
||||
build_props=$(find /system /system_root /vendor -type f -name build.prop)
|
||||
else
|
||||
if ! ${BOOTMODE}; then
|
||||
DEVICE_AB=FALSE
|
||||
VENDOR_COMPAT=FALSE
|
||||
SYSTEM_AS_ROOT=FALSE
|
||||
@ -165,16 +163,18 @@ mount_partitions () {
|
||||
echo " INFO: #8 [prop]"
|
||||
ls -l /system/*.prop
|
||||
|
||||
build_props=$(find /system /system_root /vendor -type f -name build.prop)
|
||||
echo " INFO: #9 [build_props] ${build_props}"
|
||||
|
||||
[ -z "${build_props}" ] && error "failed to mount /system (unsupported A/B device?)"
|
||||
|
||||
[ -d /system/apex ] && mount_apex
|
||||
fi
|
||||
|
||||
[ -d /apex/com.android.art ] && export ANDROID_ART_ROOT=/apex/com.android.art
|
||||
export ANDROID_RUNTIME_ROOT=/apex/com.android.runtime
|
||||
build_props=$(find /system /system_root /vendor -type f -name build.prop)
|
||||
[ -z "${build_props}" ] && error "failed to mount /system (unsupported A/B device?)"
|
||||
|
||||
if [ -d /apex/com.android.art ]; then
|
||||
export ANDROID_ART_ROOT=/apex/com.android.art
|
||||
export ANDROID_RUNTIME_ROOT=${ANDROID_ART_ROOT}
|
||||
elif [ -d /apex/com.android.runtime ]; then
|
||||
export ANDROID_RUNTIME_ROOT=/apex/com.android.runtime
|
||||
fi
|
||||
|
||||
export ANDROID_TZDATA_ROOT=/apex/com.android.tzdata
|
||||
export ANDROID_I18N_ROOT /apex/com.android.i18n
|
||||
|
Loading…
Reference in New Issue
Block a user