|
|
@ -240,7 +240,8 @@ mount_partitions () {
|
|
|
|
SYSTEM_AS_ROOT=$(getprop ro.build.system_root_image)
|
|
|
|
SYSTEM_AS_ROOT=$(getprop ro.build.system_root_image)
|
|
|
|
SYSTEM_BLOCK=/dev/block/bootdevice/by-name/system
|
|
|
|
SYSTEM_BLOCK=/dev/block/bootdevice/by-name/system
|
|
|
|
|
|
|
|
|
|
|
|
RUNTIME_APEX=""
|
|
|
|
APEX_FILE=""
|
|
|
|
|
|
|
|
APEX_DIR=""
|
|
|
|
APEX_LOOP=""
|
|
|
|
APEX_LOOP=""
|
|
|
|
|
|
|
|
|
|
|
|
if [ "${SYSTEM_AS_ROOT}" == "true" ]; then
|
|
|
|
if [ "${SYSTEM_AS_ROOT}" == "true" ]; then
|
|
|
@ -268,21 +269,27 @@ mount_partitions () {
|
|
|
|
|
|
|
|
|
|
|
|
[ ! -f /system/build.prop ] && error "failed to mount /system (unsupported A/B device?)"
|
|
|
|
[ ! -f /system/build.prop ] && error "failed to mount /system (unsupported A/B device?)"
|
|
|
|
|
|
|
|
|
|
|
|
if [ -f /system/apex/com.android.runtime.apex ]; then
|
|
|
|
for apex in com.android.runtime com.android.runtime.release com.android.runtime.debug; do
|
|
|
|
RUNTIME_APEX="/system/apex/com.android.runtime.apex"
|
|
|
|
if [ -f /system/apex/${apex}.apex ]; then
|
|
|
|
elif [ -f /system/apex/com.android.runtime.release.apex ]; then
|
|
|
|
APEX_FILE=/system/apex/${apex}.apex
|
|
|
|
RUNTIME_APEX="/system/apex/com.android.runtime.release.apex"
|
|
|
|
break
|
|
|
|
|
|
|
|
elif [ -d /system/apex/${apex} ]; then
|
|
|
|
|
|
|
|
APEX_DIR=/system/apex/${apex}
|
|
|
|
|
|
|
|
break
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
|
|
if [ -n "${RUNTIME_APEX}" ]; then
|
|
|
|
if [ -n "${APEX_FILE}" ]; then
|
|
|
|
mkdir -p /dev/tmp/apex
|
|
|
|
mkdir -p /dev/tmp/apex
|
|
|
|
unzip "${RUNTIME_APEX}" -d /dev/tmp/apex
|
|
|
|
unzip "${RUNTIME_APEX}" -d /dev/tmp/apex
|
|
|
|
|
|
|
|
|
|
|
|
mkdir -p /apex/com.android.runtime
|
|
|
|
mkdir -p /apex/com.android.runtime
|
|
|
|
|
|
|
|
|
|
|
|
mount -oloop,ro /dev/tmp/apex/apex_payload.img /apex/com.android.runtime
|
|
|
|
mount -oloop,ro /dev/tmp/apex/apex_payload.img /apex/com.android.runtime
|
|
|
|
|
|
|
|
|
|
|
|
APEX_LOOP=$(mount | awk '/com.android.runtime/{print $1}')
|
|
|
|
APEX_LOOP=$(mount | awk '/com.android.runtime/{print $1}')
|
|
|
|
|
|
|
|
elif [ -n "${APEX_DIR}" ]; then
|
|
|
|
|
|
|
|
mkdir -p /apex
|
|
|
|
|
|
|
|
ln -sf "${APEX_DIR}" /apex/com.android.runtime
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
! is_mounted /vendor && mount /vendor
|
|
|
|
! is_mounted /vendor && mount /vendor
|
|
|
|