diff --git a/mkimg.sh b/mkimg.sh index 4bc2a54..e75d948 100755 --- a/mkimg.sh +++ b/mkimg.sh @@ -19,7 +19,7 @@ if [ -z ${ANDROID_PRODUCT_OUT} ]; then exit_with_error "ANDROID_PRODUCT_OUT environment variable is not set. Run lunch first." fi -for PARTITION in "boot" "system" "vendor" "system_ext"; do +for PARTITION in "boot" "system" "system_ext" "vendor"; do if [ ! -f ${ANDROID_PRODUCT_OUT}/${PARTITION}.img ]; then exit_with_error "Partition image not found. Run 'make ${PARTITION}image' first." fi @@ -56,12 +56,12 @@ echo n echo p echo 3 echo -echo +512M +echo +256M echo n echo p echo 4 echo -echo +256M +echo +512M echo n echo p echo 5 @@ -87,10 +87,10 @@ echo "Copying boot..." sudo dd if=${ANDROID_PRODUCT_OUT}/boot.img of=/dev/mapper/${LOOPDEV}p1 bs=1M echo "Copying system..." sudo dd if=${ANDROID_PRODUCT_OUT}/system.img of=/dev/mapper/${LOOPDEV}p2 bs=1M +echo "Copying system_ext..." +sudo dd if=${ANDROID_PRODUCT_OUT}/system_ext.img of=/dev/mapper/${LOOPDEV}p3 bs=1M echo "Copying vendor..." -sudo dd if=${ANDROID_PRODUCT_OUT}/vendor.img of=/dev/mapper/${LOOPDEV}p3 bs=1M -echo "Creating system_ext..." -sudo dd if=${ANDROID_PRODUCT_OUT}/system_ext.img of=/dev/mapper/${LOOPDEV}p4 bs=1M +sudo dd if=${ANDROID_PRODUCT_OUT}/vendor.img of=/dev/mapper/${LOOPDEV}p4 bs=1M echo "Creating userdata..." sudo mkfs.ext4 /dev/mapper/${LOOPDEV}p5 -I 512 -L userdata sync @@ -100,4 +100,4 @@ sudo losetup -d "/dev/${LOOPDEV}" sudo chown ${USER}:${USER} ${ANDROID_PRODUCT_OUT}/${IMGNAME} echo "Done, created ${ANDROID_PRODUCT_OUT}/${IMGNAME}!" -exit 0 +exit 0 \ No newline at end of file