minhdangoz · May 25, 2022 17:28
diff --git a/Readme.md b/Readme.md
diff --git a/open_gapps_install_script.chroot.sh b/open_gapps_install_script.chroot.sh
 --- a/installer.sh
 +++ b/installer.sh
 @@ -1093,11 +1093,10 @@
 #                                                  Pre-define Helper Functions
 get_file_prop() { grep -m1 "^$2=" "$1" | cut -d= -f2-; }
 
 -set_progress() { echo "set_progress $1" >> $OUTFD; }
 +set_progress() { awk -v VAL=$1 'BEGIN {print "...Progress: ", (VAL * 100),"%" }' ; }
 
 ui_print() {
 -  echo "ui_print $1
 -    ui_print" >> $OUTFD
 +  echo "$1"
 }
 
 find_slot() {
 @@ -1295,27 +1294,27 @@
 [ "$ANDROID_ROOT" ] || ANDROID_ROOT=/system
 
 # emulators can only flash booted and may need /system (on legacy images), or / (on system-as-root images), remounted rw
 -if ! $BOOTMODE; then
 -  mount -o bind /dev/urandom /dev/random
 -  if [ -L /etc ]; then
 -    setup_mountpoint /etc
 -    cp -af /etc_link/* /etc
 -    sed -i 's; / ; /system_root ;' /etc/fstab
 -  fi
 -  umount_all
 -  mount_all
 -fi
 -if [ -d /dev/block/mapper ]; then
 -  for block in system vendor product system_ext; do
 -    for slot in "" _a _b; do
 -      blockdev --setrw /dev/block/mapper/$block$slot 2>/dev/null
 -    done
 -  done
 -fi
 -mount -o rw,remount -t auto /system || mount -o rw,remount -t auto /
 -(mount -o rw,remount -t auto /vendor
 -mount -o rw,remount -t auto /product
 -mount -o rw,remount -t auto /system_ext) 2>/dev/null
 +# if ! $BOOTMODE; then
 +#   mount -o bind /dev/urandom /dev/random
 +#   if [ -L /etc ]; then
 +#     setup_mountpoint /etc
 +#     cp -af /etc_link/* /etc
 +#     sed -i 's; / ; /system_root ;' /etc/fstab
 +#   fi
 +#   umount_all
 +#   mount_all
 +# fi
 +# if [ -d /dev/block/mapper ]; then
 +#   for block in system vendor product system_ext; do
 +#     for slot in "" _a _b; do
 +#       blockdev --setrw /dev/block/mapper/$block$slot 2>/dev/null
 +#     done
 +#   done
 +# fi
 +# mount -o rw,remount -t auto /system || mount -o rw,remount -t auto /
 +# (mount -o rw,remount -t auto /vendor
 +# mount -o rw,remount -t auto /product
 +# mount -o rw,remount -t auto /system_ext) 2>/dev/null
 
 ui_print " "
 
 @@ -1444,8 +1443,8 @@
   # Unmount and rollback script changes
   set_progress 1.0
   if ! $BOOTMODE; then
 -    ui_print "- Unmounting partitions"
 -    umount_all
 +    #ui_print "- Unmounting partitions"
 +    #umount_all
     [ -L /etc_link ] && rm -rf /etc/*
     local dir
     (for dir in /apex /system /system_root /etc; do
 @@ -1453,8 +1452,8 @@
         rmdir $dir
         mv -f ${dir}_link $dir
       fi
 -    done
 -    umount -l /dev/random) 2>/dev/null
 +    done) 2>/dev/null
 +    #umount -l /dev/random
   fi
 
   # Finally, clean up $TMP
 @@ -2762,7 +2761,7 @@
 # Read and save system partition size details
 df=$(df -k /system | tail -n 1)
 case $df in
 -  /dev/block/*) df=$(echo "$df" | awk '{ print substr($0, index($0,$2)) }');;
 +  /dev/*) df=$(echo "$df" | awk '{ print substr($0, index($0,$2)) }');;
 esac
 total_system_size_kb=$(echo "$df" | awk '{ print $1 }')
 used_system_size_kb=$(echo "$df" | awk '{ print $2 }')
diff --git a/open_gapps_install_script.patch b/open_gapps_install_script.patch
 --- a/installer.sh
 +++ b/installer.sh
 @@ -1093,11 +1093,10 @@
 #                                                  Pre-define Helper Functions
 get_file_prop() { grep -m1 "^$2=" "$1" | cut -d= -f2-; }
 
 -set_progress() { echo "set_progress $1" >> $OUTFD; }
 +set_progress() { awk -v VAL=$1 'BEGIN {print "...Progress: ", (VAL * 100),"%" }' ; }
 
 ui_print() {
 -  echo "ui_print $1
 -    ui_print" >> $OUTFD
 +  echo "$1"
 }
 
 find_slot() {
 @@ -1295,27 +1294,27 @@
 [ "$ANDROID_ROOT" ] || ANDROID_ROOT=/system
 
 # emulators can only flash booted and may need /system (on legacy images), or / (on system-as-root images), remounted rw
 -if ! $BOOTMODE; then
 -  mount -o bind /dev/urandom /dev/random
 -  if [ -L /etc ]; then
 -    setup_mountpoint /etc
 -    cp -af /etc_link/* /etc
 -    sed -i 's; / ; /system_root ;' /etc/fstab
 -  fi
 -  umount_all
 -  mount_all
 -fi
 -if [ -d /dev/block/mapper ]; then
 -  for block in system vendor product system_ext; do
 -    for slot in "" _a _b; do
 -      blockdev --setrw /dev/block/mapper/$block$slot 2>/dev/null
 -    done
 -  done
 -fi
 -mount -o rw,remount -t auto /system || mount -o rw,remount -t auto /
 -(mount -o rw,remount -t auto /vendor
 -mount -o rw,remount -t auto /product
 -mount -o rw,remount -t auto /system_ext) 2>/dev/null
 +# if ! $BOOTMODE; then
 +#   mount -o bind /dev/urandom /dev/random
 +#   if [ -L /etc ]; then
 +#     setup_mountpoint /etc
 +#     cp -af /etc_link/* /etc
 +#     sed -i 's; / ; /system_root ;' /etc/fstab
 +#   fi
 +#   umount_all
 +#   mount_all
 +# fi
 +# if [ -d /dev/block/mapper ]; then
 +#   for block in system vendor product system_ext; do
 +#     for slot in "" _a _b; do
 +#       blockdev --setrw /dev/block/mapper/$block$slot 2>/dev/null
 +#     done
 +#   done
 +# fi
 +# mount -o rw,remount -t auto /system || mount -o rw,remount -t auto /
 +# (mount -o rw,remount -t auto /vendor
 +# mount -o rw,remount -t auto /product
 +# mount -o rw,remount -t auto /system_ext) 2>/dev/null
 
 ui_print " "
 
 @@ -1444,8 +1443,8 @@
   # Unmount and rollback script changes
   set_progress 1.0
   if ! $BOOTMODE; then
 -    ui_print "- Unmounting partitions"
 -    umount_all
 +    #ui_print "- Unmounting partitions"
 +    #umount_all
     [ -L /etc_link ] && rm -rf /etc/*
     local dir
     (for dir in /apex /system /system_root /etc; do
 @@ -1453,8 +1452,8 @@
         rmdir $dir
         mv -f ${dir}_link $dir
       fi
 -    done
 -    umount -l /dev/random) 2>/dev/null
 +    done) 2>/dev/null
 +    #umount -l /dev/random
   fi
 
   # Finally, clean up $TMP
 @@ -2762,7 +2761,7 @@
 # Read and save system partition size details
 df=$(df -k /system | tail -n 1)
 case $df in
 -  /dev/block/*) df=$(echo "$df" | awk '{ print substr($0, index($0,$2)) }');;
 +  /dev/*) df=$(echo "$df" | awk '{ print substr($0, index($0,$2)) }');;
 esac
 total_system_size_kb=$(echo "$df" | awk '{ print $1 }')
 used_system_size_kb=$(echo "$df" | awk '{ print $2 }')
diff --git a/open_gapps_install_script.sh b/open_gapps_install_script.sh
 #!/bin/bash
 ZIPFILE=${1}
 USERNAME=${2}
 USAGESTRING="Usage: ${0} <open_gapps_zip_file.zip> <user>";
 TEMPDIR="$(mktemp --tmpdir -d "gapps_installer.XXXX")"
 export RTDIR="/mnt/mounted_avd"

 # for lpunpack, lpdump & lpmake
 LPTOOLS_BIN_DIR="/mnt/packages/lineageos/lpunpack_and_lpmake/bin"

 # path to fec binary
 FEC_BINARY="/mnt/packages/downloads/otatools/bin/fec"
 if [ -f "$FEC_BINARY" ]; then
  FEC_PATH="$(dirname "$FEC_BINARY")"
 else
  FEC_PATH="$FEC_BINARY"
 fi

 OS="$(uname)"

 if [ $UID -ne 0 ]; then
  echo "Root rights needed"
  exit 9;
 fi

 if [ $# -lt 2  ]; then
  echo "$USAGESTRING";
  exit 1;
 fi

 if [ ! -f "$ZIPFILE" ]; then
  echo "$USAGESTRING";
  exit 2;
 fi

 USER_HOME="$(sudo -u "$USERNAME" sh -c 'echo $HOME')"

 if [ ! "$ANDROID_SDK_ROOT" ]; then
  if [ -d "$USER_HOME/Android/Sdk" ]; then
    echo "ANDROID_SDK_ROOT is not set, using default value: $USER_HOME/Android/Sdk"
    ANDROID_SDK_ROOT="$USER_HOME/Android/Sdk"
  else
    echo "ANDROID_SDK_ROOT is not set"
    exit 3;
  fi
 fi

 if [ ! -d "$ANDROID_SDK_ROOT" ]; then
  echo "ANDROID_SDK_ROOT is not valid"
  exit 4;
 fi

 a="/$0"; a=${a%/*}; a=${a#/}; a=${a:-.}; SCRIPT_DIR="$(cd "$a"; pwd -P)" || exit 1

 ########## Functions BEGIN #############

 map_disk_img() {
    if [ ! -v 2 ]; then
      line=1 # We want the 1st line
    else
      line=$2
    fi
    if [[ "$OS" == "Linux" ]]; then
        if ! which kpartx > /dev/null; then
        echo "kpartx command missing, cannot continue";
        exit 11;
        fi
        DEVICE="/dev/mapper/$(kpartx -a -v "$1" | cut -f 3 -d ' ' | sed "$line"'!'"d" )"
    elif [[ "$OS" == "Darwin" ]]; then
        # TODO
        DEVICE=$(hdiutil attach -imagekey diskimage-class=CRawDiskImage -nomount "$1" | grep "Linux Filesystem"  | head -1 | cut -f 1 -d ' ')
    fi
 }

 is_mounted() {
    if [[ "$OS" == "Linux" ]]; then
      if mountpoint -q "$1"; then
        return 0
      else
        return 1
      fi
    elif [[ "$OS" == "Darwin" ]]; then
      if mount | grep -q "$1" > /dev/null; then
        return 0
      else
        return 1
      fi
    fi
 }

 mount_img() {
  # $1 image path
  # $2 mount path

  local DEVICE

  if file -b "$1" | grep "DOS/MBR boot sector" > /dev/null; then
    map_disk_img "$1"
    if is_mounted "$2"; then
        mount -o remount "$DEVICE" "$2"
    else
        mount "$DEVICE" "$2"
    fi
  elif file -b "$1" | grep "ext. filesystem data" > /dev/null; then
    if is_mounted "$2"; then
      mount -o remount "$1" "$2"
    else
      mount "$1" "$2"
    fi
  fi
 }

 umount_img() {
  # $1 image path
  # $2 mount path
  if is_mounted "$2"; then
    umount "$2"
  fi
  if losetup | grep "$(realpath "$1")" > /dev/null; then
    kpartx -d -v "$1"
  fi
 }

 # Mount the filesystems locally & use the installer.sh script provided by OpenGApps
 install_with_opengapps_installer() {
  echo -e "\nMouting the images..."
  # Mount the images
  mkdir -p "$RTDIR"

  mount_img "$AVD_DIR/tmp/system.img" "$RTDIR"
  if [ ! -d "$RTDIR/system" ]; then
    SYSIMG_IS_SYSTEM="true"
    # On API27, system.img has the content of /system
    umount_img "$AVD_DIR/tmp/system.img" "$RTDIR"
    mkdir -p "$RTDIR/"{system,cache,vendor,proc,dev}
    mount_img "$AVD_DIR/tmp/system.img" "$RTDIR/system"
  fi
  mount_img "$AVD_DIR/tmp/vendor.img" "$RTDIR/vendor"
  mount_img "$AVD_DIR/cache.img" "$RTDIR/cache"

  if [ -d "$RTDIR/tmp" ]; then
    ROOT_TMP_EXISTED="true"
  fi

  #it doesn's seem userdata.img is used at first boot, so skip.
  #mke2fs $AVD_DIR/userdata.img
  #mount $AVD_DIR/userdata.img $RTDIR/data

  mount --bind /proc/ "$RTDIR/proc"
  mount --bind /dev/ "$RTDIR/dev"

  # Mount dir holding the zip (so that it doesn't take space on "/system"
  mkdir -p "$RTDIR/tmp_opengappzip"
  mount --bind "$(dirname "$ZIPFILE")" "$RTDIR/tmp_opengappzip"

  # Change pid_max to a value that suits the chroot
  PID_MAX_ORIG=$(cat /proc/sys/kernel/pid_max)
  echo -e "\nOriginal PID_Max was $PID_MAX_ORIG"
  echo "Run 'echo $PID_MAX_ORIG > /proc/sys/kernel/pid_max' to revert to it"
  echo 65500 > /proc/sys/kernel/pid_max

  echo -e "\nPreparing the chroot environment..."

  # Unpack busybox
  unzip -o "$RTDIR/tmp_opengappzip/$(basename "$ZIPFILE")" busybox-x86 -d "$RTDIR/tmp"
  mkdir -p "$RTDIR/tmp/bin"
  $RTDIR/tmp/busybox-x86 --install "$RTDIR/tmp/bin"

  # Copy patch & chroot script to chroot dir
  mkdir -p "$RTDIR/tmp/opengapps_in_emulator"
  cp "$SCRIPT_DIR/open_gapps_install_script.patch" "$RTDIR/tmp/opengapps_in_emulator"
  cp "$SCRIPT_DIR/open_gapps_install_script.chroot.sh" "$RTDIR/tmp/opengapps_in_emulator"
  chmod 755 "$SCRIPT_DIR/open_gapps_install_script.chroot.sh"

  # Run script in chroot
  echo -e "\nEntering the chroot environment to install OpenGApps..."
  PATH=/tmp/bin:/system/bin:$PATH chroot "$RTDIR" "/tmp/bin/bash" "/tmp/opengapps_in_emulator/open_gapps_install_script.chroot.sh" "$(basename "$ZIPFILE")"
  echo -e "\nLeaving chroot..."

  # Make a copy of the /data partition because we can't load it into the chroot
  #mkdir -p /tmp/my_avd_data
  #cp -a "$RTDIR/data/*" /tmp/my_avd_data/

  # Restore original pid_max
  echo $PID_MAX_ORIG > /proc/sys/kernel/pid_max

  # Unmount the images & cleanup
  echo -e "\nUnmouting the images..."
  umount "$RTDIR/tmp_opengappzip"
  rmdir "$RTDIR/tmp_opengappzip"
  if [ ! "a$ROOT_TMP_EXISTED" = "atrue" ]; then rmdir "$RTDIR/tmp" ; fi
  umount_img "$AVD_DIR/cache.img" "$RTDIR/cache"
  umount_img "$AVD_DIR/tmp/vendor.img" "$RTDIR/vendor"
  #umount_img "$RTDIR/data"
  umount "$RTDIR/proc"
  umount "$RTDIR/dev"
  if [[ "a$SYSIMG_IS_SYSTEM" == "atrue" ]]; then
    rmdir "$RTDIR/"{system,cache,vendor,proc,dev,tmp}
    umount_img "$AVD_DIR/tmp/system.img" "$RTDIR/system"
  else
    umount_img "$AVD_DIR/tmp/system.img" "$RTDIR"
  fi

  # Review the contents of the data partition, you may need to copy
  # things over through adb once the emulator is loaded (if this works)

  # adb push /tmp/my_avd_data/* /data
  # rm -r /tmp/my_avd_data/

 }

 upsize_extfs() {
  # $1 device path to the filesystem to upsize
  # $2 size

  "${ANDROID_SDK_ROOT}/emulator/bin64/e2fsck" -f "$1" 2> /dev/null
  if [ -z "$2" ]; then
    "${ANDROID_SDK_ROOT}/emulator/bin64/resize2fs" "$1" 2> /dev/null
  else
    "${ANDROID_SDK_ROOT}/emulator/bin64/resize2fs" "$1" "$2" 2> /dev/null
  fi
 }

 resize_img() {
  local image="$1"
  local size="$2"
  if file -b "$image" | grep "DOS/MBR boot sector" > /dev/null; then
    # The system.img is not ext2/ext4 but a DOS/MBR boot sector which contains an ext2/3/4 fs
    echo -e "\nResizing sysem partition to $size... (you can safely ignore the warning 'The kernel is still using the old partition table.')"
    fallocate -l "$size" "$image"
    PART_UUID=$(sgdisk -i 1 "$image" | grep "unique GUID" | cut -d ' ' -f4)
    sgdisk -d 1 "$image"
    sgdisk -n 1:0:0 "$image"
    sgdisk -c 1:system "$image"
    sgdisk -u 1:$PART_UUID "$image"
    PART=$(kpartx -a -v "$image" | cut -f 3 -d ' ')
    SYS_EXT_PART_PATH="/dev/mapper/$PART"
    upsize_extfs "$SYS_EXT_PART_PATH" ;
    kpartx -d -v "$image"
    echo "Resizing sysem partition to $size finished successfully!"
  elif file -b "$image" | grep "ext. filesystem data" > /dev/null; then
    upsize_extfs "$image" "$size"
  else
    echo "$image format not supported by this script"
    exit 10;
  fi
 }

 unpack_images() {
  echo -e "\nUnpack original partition images for ${AVD}"
  mkdir -p "$AVD_DIR/tmp"
  if [ $(kpartx "${ANDROID_SDK_ROOT}/${IMAGE_SYSDIR}/system.img" | wc -l) -gt 1 ]; then
    lptools_required
    # API 29 image (android Q) holding a super.img
    map_disk_img "${ANDROID_SDK_ROOT}/${IMAGE_SYSDIR}/system.img" 2
    "$LPTOOLS_BIN_DIR/lpunpack" --slot=0 -p system "$DEVICE" "$AVD_DIR/tmp"
    "$LPTOOLS_BIN_DIR/lpunpack" --slot=0 -p vendor "$DEVICE" "$AVD_DIR/tmp"
    "$LPTOOLS_BIN_DIR/lpdump" -j "$DEVICE" > "$AVD_DIR/tmp/lpdump.json"
    "$LPTOOLS_BIN_DIR/lpdump" "$DEVICE" > "$AVD_DIR/tmp/lpdump.txt"

    # Filesystems have the feature: EXT4_FEATURE_RO_COMPAT_SHARED_BLOCKS
    # We need to remove it to mount rw,
    # and at least resize the partition a bit if there is not enough space
    for img in system.img vendor.img; do
        FS_SIZE=$(wc -c "$AVD_DIR/tmp/$img" | cut -f 1 -d ' ')
        e2fsck -f -y "$AVD_DIR/tmp/$img"
        # Increase size by 10% to be able to unshare_blocks
        resize2fs "$AVD_DIR/tmp/$img" $(( FS_SIZE * 11 / 10 / 1024 ))K
        e2fsck -y -E unshare_blocks "$AVD_DIR/tmp/$img" > /dev/null 2>&1
        e2fsck -f -y "$AVD_DIR/tmp/$img"
    done
  else
    cp "${ANDROID_SDK_ROOT}/${IMAGE_SYSDIR}/vendor.img" "${AVD_DIR}/tmp/vendor.img"
    cp "${ANDROID_SDK_ROOT}/${IMAGE_SYSDIR}/system.img" "${AVD_DIR}/tmp/system.img"
  fi
  if [ -f "${ANDROID_SDK_ROOT}/${IMAGE_SYSDIR}/encryptionkey.img" ]; then
    if [ ! -f "${AVD_DIR}/encryptionkey.img" ]; then
      echo "copying encryptionkey.img ..."
      cp "${ANDROID_SDK_ROOT}/${IMAGE_SYSDIR}/encryptionkey.img" "${AVD_DIR}/encryptionkey.img"
    fi
  fi
 }

 cleanup_avd() {
  rm -f "${AVD_DIR}/vendor.img"
  rm -f "${AVD_DIR}/system.img"
  rm -f "${AVD_DIR}/cache.img"
  rm -f "${AVD_DIR}/cache.img.qcow2"
  rm -f "${AVD_DIR}/userdata-qemu.img"
  rm -f "${AVD_DIR}/userdata-qemu.img.qcow2"
  rm -fr "${AVD_DIR}/snapshots/default_boot/"
 }

 disable_verified_boot_pre_q() {
  # On Android Pie, we disable it since we modify the system.img file. Otherwise the emulator will not boot.
  if [ -f "${ANDROID_SDK_ROOT}/${IMAGE_SYSDIR}/VerifiedBootParams.textproto" ] \
    && grep "^dm_param" "${ANDROID_SDK_ROOT}/${IMAGE_SYSDIR}/VerifiedBootParams.textproto" > /dev/null ; then
    # If the file exists, maybe the emulator has Verity/Verified boot enabled.
    if [ ! -f "${AVD_DIR}/VerifiedBootParams.textproto" ]; then
      echo "copying VerifiedBootParams.textproto..."
      cp "${ANDROID_SDK_ROOT}/${IMAGE_SYSDIR}/VerifiedBootParams.textproto" "${AVD_DIR}/VerifiedBootParams.textproto"
    fi
    echo "Disabling verity/verified-boot..."
    sed -i -e "s/^dm_param/#dm_param/" "${AVD_DIR}/VerifiedBootParams.textproto"
  fi
 }

 lptools_required() {
  if [ ! -e $LPTOOLS_BIN_DIR/lpmake ] || [ ! -e $LPTOOLS_BIN_DIR/lpmake ] || [ ! -e $LPTOOLS_BIN_DIR/lpmake ]; then
    echo "lpmake, lpdump and lpunpack are missing. Get them and check LPTOOLS_BIN_DIR in the script "
    echo "Packaged sources (including the minimal android sources to build): https://github.com/LonelyFool/lpunpack_and_lpmake"
    echo "Upstream sources (needs all android sources): https://android.googlesource.com/platform/system/extras/+/refs/heads/master/partition_tools/"
    exit 8
  fi
 }

 repack_images() {

  # No need to repack if this is not a combined_img (appeard in android Q)
  if [ $(kpartx "${ANDROID_SDK_ROOT}/${IMAGE_SYSDIR}/system.img" | wc -l) -le 1 ]; then return 0; fi

  # Build the dynamic partiton system.img and the avb/verity/verified-boot related files/hases for android Q+ (10+)

  lptools_required

  if [ ! -e $FEC_BINARY ]; then
    echo "fec binary missing. Get them and check FEC_BINARY in the script "
    echo "prebuild binary can be found in the otatools here: https://forum.xda-developers.com/t/guide-ota-tools-lpunpack.4041843/"
    exit 8
  fi

  # Doc for verified boot:
  # https://android.googlesource.com/platform/external/avb/+/master/README.md

  # Download & extract some required scripts & files from anroid sources:
  wget -nc https://android.googlesource.com/platform/external/avb/+archive/master.tar.gz -O "$TEMPDIR/avbtool.tar.gz"
  tar -xvf "$TEMPDIR/avbtool.tar.gz" -C "$TEMPDIR" \
    avbtool.py \
    test/data/testkey_rsa2048.pem \
    test/data/testkey_rsa4096.pem
  chmod +x "$TEMPDIR/avbtool.py"
  mv "$TEMPDIR/test/data/testkey_rsa2048.pem" "$TEMPDIR/"
  mv "$TEMPDIR/test/data/testkey_rsa4096.pem" "$TEMPDIR/"
  rmdir "$TEMPDIR/test/data"
  rmdir "$TEMPDIR/test"

  # https://cs.android.com/android/platform/superproject/+/master:device/generic/goldfish/tools/mk_vbmeta_boot_params.sh
  # https://cs.android.com/android/platform/superproject/+/master:device/generic/goldfish/tools/mk_combined_img.py
  wget -nc https://android.googlesource.com/device/generic/goldfish/+archive/refs/heads/master/tools.tar.gz -O "$TEMPDIR/goldfish_tools.tar.gz"
  tar -xvf "$TEMPDIR/goldfish_tools.tar.gz" -C "$TEMPDIR" \
    mk_vbmeta_boot_params.sh \
    mk_combined_img.py
  chmod +x "$TEMPDIR/mk_vbmeta_boot_params.sh"
  chmod +x "$TEMPDIR/mk_combined_img.py"

  # Add Hashtree footer to the images
  # We need the binary of "fec"
  # Sources: here http://www.ka9q.net/code/fec/ or there https://android.googlesource.com/platform/external/fec/+/master/)
  # Binary in otatools
  #$TEMPDIR/avbtool.py erase_footer --image "${AVD_DIR}/tmp/vendor.img"
  PATH=$PATH:$FEC_PATH "$TEMPDIR/avbtool.py" add_hashtree_footer \
    --partition_name vendor \
    --partition_size 0 \
    --image "${AVD_DIR}/tmp/vendor.img"
    #--prop com.android.build.system.os_version:10

  "$TEMPDIR/avbtool.py" info_image   --image "${AVD_DIR}/tmp/vendor.img"
  "$TEMPDIR/avbtool.py" verify_image --image "${AVD_DIR}/tmp/vendor.img"

  #"$TEMPDIR/avbtool.py" erase_footer --image "${AVD_DIR}/tmp/system.img"
  # We skip the rollback index value (--rollback-index)
  PATH=$PATH:$FEC_PATH "$TEMPDIR/avbtool.py" add_hashtree_footer \
    --partition_name system \
    --partition_size 0 \
    --image "${AVD_DIR}/tmp/system.img" \
    --algorithm SHA256_RSA2048 \
    --key "$TEMPDIR/testkey_rsa2048.pem"
    #--prop com.android.build.system.os_version:10 \
    #--prop com.android.build.system.security_patch:2019-09-05

  "$TEMPDIR/avbtool.py" info_image   --image "${AVD_DIR}/tmp/system.img"
  "$TEMPDIR/avbtool.py" verify_image --image "${AVD_DIR}/tmp/system.img" --key "$TEMPDIR/testkey_rsa2048.pem"

  "$TEMPDIR/avbtool.py" extract_public_key --key "$TEMPDIR/testkey_rsa2048.pem" --output "$TEMPDIR/system_rsa2048.avbpubkey"

 # Create vbmeta image with dm-verity disabled
 # https://wiki.postmarketos.org/wiki/Android_Verified_Boot_(AVB)
 #   "$TEMPDIR/avbtool.py" make_vbmeta_image \
 #     --flags 2 \
 #     --padding_size 4096 \
 #     --output ${AVD_DIR}/tmp/vbmeta_disabled.img \
 #     --chain_partition system:1:$TEMPDIR/system_rsa2048.avbpubkey

  # Remove old vbmeta.img, then create vbmeta image
  rm -f "${AVD_DIR}/tmp/vbmeta.img"
  "$TEMPDIR/avbtool.py" make_vbmeta_image \
    --algorithm SHA256_RSA4096 \
    --key "$TEMPDIR/testkey_rsa4096.pem" \
    --padding_size 4096 \
    --output "${AVD_DIR}/tmp/vbmeta.img" \
    --chain_partition system:1:$TEMPDIR/system_rsa2048.avbpubkey \
    --include_descriptors_from_image "${AVD_DIR}/tmp/vendor.img"

  "$TEMPDIR/avbtool.py" info_image   --image "${AVD_DIR}/tmp/vbmeta.img"
  "$TEMPDIR/avbtool.py" verify_image --image "${AVD_DIR}/tmp/vbmeta.img" \
    --expected_chain_partition system:1:$TEMPDIR/system_rsa2048.avbpubkey \
    --key "$TEMPDIR/testkey_rsa4096.pem"

  # Create VerifiedBootParams.textproto
  AVBTOOL="$(realpath "$TEMPDIR/avbtool.py")" "$TEMPDIR/mk_vbmeta_boot_params.sh" \
    "${AVD_DIR}/tmp/vbmeta.img" \
    "${AVD_DIR}/tmp/system.img" \
    "${AVD_DIR}/tmp/VerifiedBootParams.textproto"
  mv "${AVD_DIR}/tmp/VerifiedBootParams.textproto" "${AVD_DIR}/VerifiedBootParams.textproto"

  # Prepare variables to repack super.img with lpmake
  REPLICATE_LPDUMP=0
  if [[ $REPLICATE_LPDUMP -eq 1 ]]; then
    LPMAKE_DEVICE_SIZE=$(jq -r '.block_devices[0].size' "$AVD_DIR/tmp/lpdump.json")
    LPMAKE_SUPER_NAME=$(jq -r '.block_devices[0].name' "$AVD_DIR/tmp/lpdump.json")
    LPMAKE_ALIGNMENT=$(jq -r '.block_devices[0].alignment' "$AVD_DIR/tmp/lpdump.json")
    LPMAKE_BLOCK_SIZE=$(jq -r '.block_devices[0].block_size' "$AVD_DIR/tmp/lpdump.json")
    LPMAKE_GROUP_NAME=$(jq -r '.partitions[0].group_name' "$AVD_DIR/tmp/lpdump.json")
    LPMAKE_METADATA_SIZE=$(cat "$AVD_DIR/tmp/lpdump.txt" | grep "Metadata max size:" | cut -d ' ' -f 4)
    LPMAKE_METADATA_SLOTS=$(cat "$AVD_DIR/tmp/lpdump.txt" | grep "Metadata slot count:" | cut -d ' ' -f 4)
    LPMAKE_PART_SYSTEM_SIZE=$(jq -r '.partitions[] | select(.name | contains("system")).size ' "$AVD_DIR/tmp/lpdump.json")
    LPMAKE_PART_VENDOR_SIZE=$(jq -r '.partitions[] | select(.name | contains("vendor")).size ' "$AVD_DIR/tmp/lpdump.json")
    LPMAKE_GROUP_MAX_SIZE=$(jq -r '.groups[] | select(.name | contains ("'$LPMAKE_GROUP_NAME'")).maximum_size' "$AVD_DIR/tmp/lpdump.json")
  else
    LPMAKE_SUPER_NAME=$(jq -r '.block_devices[0].name' "$AVD_DIR/tmp/lpdump.json")
    LPMAKE_ALIGNMENT=$(jq -r '.block_devices[0].alignment' "$AVD_DIR/tmp/lpdump.json")
    LPMAKE_BLOCK_SIZE=$(jq -r '.block_devices[0].block_size' "$AVD_DIR/tmp/lpdump.json")
    LPMAKE_GROUP_NAME=$(jq -r '.partitions[0].group_name' "$AVD_DIR/tmp/lpdump.json")
    LPMAKE_METADATA_SIZE=$(cat "$AVD_DIR/tmp/lpdump.txt" | grep "Metadata max size:" | cut -d ' ' -f 4)
    LPMAKE_METADATA_SLOTS=$(cat "$AVD_DIR/tmp/lpdump.txt" | grep "Metadata slot count:" | cut -d ' ' -f 4)
    LPMAKE_PART_SYSTEM_SIZE=$(wc -c "$AVD_DIR/tmp/system.img" | cut -f 1 -d ' ')
    LPMAKE_PART_VENDOR_SIZE=$(wc -c "$AVD_DIR/tmp/vendor.img" | cut -f 1 -d ' ')
    # LPMAKE_GROUP_MAX_SIZE: round size to multiple of 1024*1024 (size of all partitions + 2MiB)
    LPMAKE_GROUP_MAX_SIZE=$(( ( ( ( LPMAKE_PART_SYSTEM_SIZE + LPMAKE_PART_VENDOR_SIZE ) / 1024 / 1024 ) + 2 ) * 1024 * 1024))
    # LPMAKE_DEVICE_SIZE = LPMAKE_GROUP_MAX_SIZE + 8MiB
    LPMAKE_DEVICE_SIZE=$(( LPMAKE_GROUP_MAX_SIZE + ( 8 * 1024 * 1024 ) ))
    #LPMAKE_DEVICE_SIZE=$(( $(jq -r '.block_devices[0].size' "$AVD_DIR/tmp/lpdump.json") + (100 * 1024 * 1024) ))
  fi

  # Repack the super.img
  "$LPTOOLS_BIN_DIR/lpmake" \
    --device-size=$LPMAKE_DEVICE_SIZE \
    --metadata-size=$LPMAKE_METADATA_SIZE \
    --metadata-slots=$LPMAKE_METADATA_SLOTS \
    --output="${AVD_DIR}/tmp/super.img" \
    -p system:readonly:$LPMAKE_PART_SYSTEM_SIZE:$LPMAKE_GROUP_NAME \
    -i system="${AVD_DIR}/tmp/system.img" \
    -p vendor:readonly:$LPMAKE_PART_VENDOR_SIZE:$LPMAKE_GROUP_NAME \
    -i vendor="${AVD_DIR}/tmp/vendor.img" \
    --block-size=$LPMAKE_BLOCK_SIZE \
    --alignment=$LPMAKE_ALIGNMENT \
    --super-name="$LPMAKE_SUPER_NAME" \
    --group=$LPMAKE_GROUP_NAME:$LPMAKE_GROUP_MAX_SIZE

  # Delete system.img & vendor.img (we now have super.img)
  #for img in system.img vendor.img; do
  #  rm "${AVD_DIR}/tmp/$img"
  #done

  if [[ $REPLICATE_LPDUMP -eq 1 ]]; then
    dd if="${DEVICE::-1}1" of="${AVD_DIR}/vbmeta.img"
  fi

  # Prepare image_config file to build the combined img that will be used as system.img for the emulator
  echo "${AVD_DIR}/tmp/vbmeta.img vbmeta 1" > "${AVD_DIR}/tmp/image_config"
  echo "${AVD_DIR}/tmp/super.img super 2" >> "${AVD_DIR}/tmp/image_config"

  # Fix incorrect arguments when calling sgdisk (replace --type= by --typecode= )
  sed -i -e "s/--type=/--typecode=/" "$TEMPDIR/mk_combined_img.py"

  # Remove previous image (because the mk_combined_img.py behaves differently if the file already exists)
  # Then, create the combined image
  rm -f "${AVD_DIR}/tmp/combined.img"
  "$TEMPDIR/mk_combined_img.py" -i "${AVD_DIR}/tmp/image_config" -o "${AVD_DIR}/tmp/combined.img"

  # Cleanup
  rm "${AVD_DIR}/tmp/image_config"
  rm "${AVD_DIR}/tmp/vbmeta.img"
  rm "${AVD_DIR}/tmp/super.img"
  rm "${AVD_DIR}/tmp/lpdump.json"
  rm "${AVD_DIR}/tmp/lpdump.txt"


  # Some variables set in Android Makefile
  #BOARD_AVB_ENABLE := true
  #BOARD_AVB_ALGORITHM := SHA256_RSA4096
  #BOARD_AVB_KEY_PATH := external/avb/test/data/$TEMPDIR/testkey_rsa4096.pem
  # Enable chain partition for system. https://cs.android.com/android/platform/superproject/+/master:build/make/target/board/BoardConfigEmuCommon.mk;l=82?q=BOARD_AVB_SYSTEM_KEY_PATH&ss=android%2Fplatform%2Fsuperproject
  #BOARD_AVB_SYSTEM_KEY_PATH := external/avb/test/data/$TEMPDIR/testkey_rsa2048.pem
  #BOARD_AVB_SYSTEM_ALGORITHM := SHA256_RSA2048
  #BOARD_AVB_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
  #BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 1
  #BOARD_SUPER_PARTITION_SIZE := 3229614080

 }

 ########## Functions END #############

 echo "Which AVD?"
 sudo -u "$USERNAME" "${ANDROID_SDK_ROOT}/emulator/emulator" -list-avds
 echo -en "\n>"
 read -r AVD

 AVD_DIR=$(grep "path=" "${USER_HOME}/.android/avd/${AVD}.ini" | cut -f2 -d"=")
 AVD_DIR=${AVD_DIR// } # trim

 echo -en "\ndetermining location of system.img file for ${AVD} ... "
 IMAGE_SYSDIR=$(grep "image.sysdir.1" "${AVD_DIR}/config.ini" | cut -f2 -d"=")
 IMAGE_SYSDIR=${IMAGE_SYSDIR// } # trim
 echo "${ANDROID_SDK_ROOT}/${IMAGE_SYSDIR}"

 # Cleanup current avd instance
 cleanup_avd

 # Copy clean system.img to selected AVD and related stuff
 unpack_images

 # Resize system.img
 resize_img "${AVD_DIR}/tmp/system.img" "3072M"

 # Install with the OpenGApps installer in a chroot environment
 install_with_opengapps_installer

 # Repack images
 repack_images

 # Disable verfied boot (for version before Android-Q)
 disable_verified_boot_pre_q

 # Resize data partition
 sed -i -e "s/disk.dataPartition.size.*/disk.dataPartition.size=1536M/" "${AVD_DIR}/config.ini"

 # Install the built images into the avd
 if [ $(kpartx "${ANDROID_SDK_ROOT}/${IMAGE_SYSDIR}/system.img" | wc -l) -le 1 ]; then
  mv "${AVD_DIR}/tmp/system.img" "${AVD_DIR}"
  mv "${AVD_DIR}/tmp/vendor.img" "${AVD_DIR}"
 else
  # Move combined.img to system.img for use by the emulator
  mv "${AVD_DIR}/tmp/combined.img" "${AVD_DIR}/system.img"
 fi

 rm -r "$TEMPDIR"
 rmdir "${AVD_DIR}/tmp"
	--- a/installer.sh
	+++ b/installer.sh
	@@ -1093,11 +1093,10 @@
	# Pre-define Helper Functions
	get_file_prop() { grep -m1 "^$2=" "$1" \| cut -d= -f2-; }

	-set_progress() { echo "set_progress $1" >> $OUTFD; }
	+set_progress() { awk -v VAL=$1 'BEGIN {print "...Progress: ", (VAL * 100),"%" }' ; }

	ui_print() {
	- echo "ui_print $1
	- ui_print" >> $OUTFD
	+ echo "$1"
	}

	find_slot() {
	@@ -1295,27 +1294,27 @@
	[ "$ANDROID_ROOT" ] \|\| ANDROID_ROOT=/system

	# emulators can only flash booted and may need /system (on legacy images), or / (on system-as-root images), remounted rw
	-if ! $BOOTMODE; then
	- mount -o bind /dev/urandom /dev/random
	- if [ -L /etc ]; then
	- setup_mountpoint /etc
	- cp -af /etc_link/* /etc
	- sed -i 's; / ; /system_root ;' /etc/fstab
	- fi
	- umount_all
	- mount_all
	-fi
	-if [ -d /dev/block/mapper ]; then
	- for block in system vendor product system_ext; do
	- for slot in "" _a _b; do
	- blockdev --setrw /dev/block/mapper/$block$slot 2>/dev/null
	- done
	- done
	-fi
	-mount -o rw,remount -t auto /system \|\| mount -o rw,remount -t auto /
	-(mount -o rw,remount -t auto /vendor
	-mount -o rw,remount -t auto /product
	-mount -o rw,remount -t auto /system_ext) 2>/dev/null
	+# if ! $BOOTMODE; then
	+# mount -o bind /dev/urandom /dev/random
	+# if [ -L /etc ]; then
	+# setup_mountpoint /etc
	+# cp -af /etc_link/* /etc
	+# sed -i 's; / ; /system_root ;' /etc/fstab
	+# fi
	+# umount_all
	+# mount_all
	+# fi
	+# if [ -d /dev/block/mapper ]; then
	+# for block in system vendor product system_ext; do
	+# for slot in "" _a _b; do
	+# blockdev --setrw /dev/block/mapper/$block$slot 2>/dev/null
	+# done
	+# done
	+# fi
	+# mount -o rw,remount -t auto /system \|\| mount -o rw,remount -t auto /
	+# (mount -o rw,remount -t auto /vendor
	+# mount -o rw,remount -t auto /product
	+# mount -o rw,remount -t auto /system_ext) 2>/dev/null

	ui_print " "

	@@ -1444,8 +1443,8 @@
	# Unmount and rollback script changes
	set_progress 1.0
	if ! $BOOTMODE; then
	- ui_print "- Unmounting partitions"
	- umount_all
	+ #ui_print "- Unmounting partitions"
	+ #umount_all
	[ -L /etc_link ] && rm -rf /etc/*
	local dir
	(for dir in /apex /system /system_root /etc; do
	@@ -1453,8 +1452,8 @@
	rmdir $dir
	mv -f ${dir}_link $dir
	fi
	- done
	- umount -l /dev/random) 2>/dev/null
	+ done) 2>/dev/null
	+ #umount -l /dev/random
	fi

	# Finally, clean up $TMP
	@@ -2762,7 +2761,7 @@
	# Read and save system partition size details
	df=$(df -k /system \| tail -n 1)
	case $df in
	- /dev/block/*) df=$(echo "$df" \| awk '{ print substr($0, index($0,$2)) }');;
	+ /dev/*) df=$(echo "$df" \| awk '{ print substr($0, index($0,$2)) }');;
	esac
	total_system_size_kb=$(echo "$df" \| awk '{ print $1 }')
	used_system_size_kb=$(echo "$df" \| awk '{ print $2 }')
	#!/bin/bash
	ZIPFILE=${1}
	USERNAME=${2}
	USAGESTRING="Usage: ${0} <open_gapps_zip_file.zip> <user>";
	TEMPDIR="$(mktemp --tmpdir -d "gapps_installer.XXXX")"
	export RTDIR="/mnt/mounted_avd"

	# for lpunpack, lpdump & lpmake
	LPTOOLS_BIN_DIR="/mnt/packages/lineageos/lpunpack_and_lpmake/bin"

	# path to fec binary
	FEC_BINARY="/mnt/packages/downloads/otatools/bin/fec"
	if [ -f "$FEC_BINARY" ]; then
	FEC_PATH="$(dirname "$FEC_BINARY")"
	else
	FEC_PATH="$FEC_BINARY"
	fi

	OS="$(uname)"

	if [ $UID -ne 0 ]; then
	echo "Root rights needed"
	exit 9;
	fi

	if [ $# -lt 2 ]; then
	echo "$USAGESTRING";
	exit 1;
	fi

	if [ ! -f "$ZIPFILE" ]; then
	echo "$USAGESTRING";
	exit 2;
	fi

	USER_HOME="$(sudo -u "$USERNAME" sh -c 'echo $HOME')"

	if [ ! "$ANDROID_SDK_ROOT" ]; then
	if [ -d "$USER_HOME/Android/Sdk" ]; then
	echo "ANDROID_SDK_ROOT is not set, using default value: $USER_HOME/Android/Sdk"
	ANDROID_SDK_ROOT="$USER_HOME/Android/Sdk"
	else
	echo "ANDROID_SDK_ROOT is not set"
	exit 3;
	fi
	fi

	if [ ! -d "$ANDROID_SDK_ROOT" ]; then
	echo "ANDROID_SDK_ROOT is not valid"
	exit 4;
	fi

	a="/$0"; a=${a%/*}; a=${a#/}; a=${a:-.}; SCRIPT_DIR="$(cd "$a"; pwd -P)" \|\| exit 1

	########## Functions BEGIN #############

	map_disk_img() {
	if [ ! -v 2 ]; then
	line=1 # We want the 1st line
	else
	line=$2
	fi
	if [[ "$OS" == "Linux" ]]; then
	if ! which kpartx > /dev/null; then
	echo "kpartx command missing, cannot continue";
	exit 11;
	fi
	DEVICE="/dev/mapper/$(kpartx -a -v "$1" \| cut -f 3 -d ' ' \| sed "$line"'!'"d" )"
	elif [[ "$OS" == "Darwin" ]]; then
	# TODO
	DEVICE=$(hdiutil attach -imagekey diskimage-class=CRawDiskImage -nomount "$1" \| grep "Linux Filesystem" \| head -1 \| cut -f 1 -d ' ')
	fi
	}

	is_mounted() {
	if [[ "$OS" == "Linux" ]]; then
	if mountpoint -q "$1"; then
	return 0
	else
	return 1
	fi
	elif [[ "$OS" == "Darwin" ]]; then
	if mount \| grep -q "$1" > /dev/null; then
	return 0
	else
	return 1
	fi
	fi
	}

	mount_img() {
	# $1 image path
	# $2 mount path

	local DEVICE

	if file -b "$1" \| grep "DOS/MBR boot sector" > /dev/null; then
	map_disk_img "$1"
	if is_mounted "$2"; then
	mount -o remount "$DEVICE" "$2"
	else
	mount "$DEVICE" "$2"
	fi
	elif file -b "$1" \| grep "ext. filesystem data" > /dev/null; then
	if is_mounted "$2"; then
	mount -o remount "$1" "$2"
	else
	mount "$1" "$2"
	fi
	fi
	}

	umount_img() {
	# $1 image path
	# $2 mount path
	if is_mounted "$2"; then
	umount "$2"
	fi
	if losetup \| grep "$(realpath "$1")" > /dev/null; then
	kpartx -d -v "$1"
	fi
	}

	# Mount the filesystems locally & use the installer.sh script provided by OpenGApps
	install_with_opengapps_installer() {
	echo -e "\nMouting the images..."
	# Mount the images
	mkdir -p "$RTDIR"

	mount_img "$AVD_DIR/tmp/system.img" "$RTDIR"
	if [ ! -d "$RTDIR/system" ]; then
	SYSIMG_IS_SYSTEM="true"
	# On API27, system.img has the content of /system
	umount_img "$AVD_DIR/tmp/system.img" "$RTDIR"
	mkdir -p "$RTDIR/"{system,cache,vendor,proc,dev}
	mount_img "$AVD_DIR/tmp/system.img" "$RTDIR/system"
	fi
	mount_img "$AVD_DIR/tmp/vendor.img" "$RTDIR/vendor"
	mount_img "$AVD_DIR/cache.img" "$RTDIR/cache"

	if [ -d "$RTDIR/tmp" ]; then
	ROOT_TMP_EXISTED="true"
	fi

	#it doesn's seem userdata.img is used at first boot, so skip.
	#mke2fs $AVD_DIR/userdata.img
	#mount $AVD_DIR/userdata.img $RTDIR/data

	mount --bind /proc/ "$RTDIR/proc"
	mount --bind /dev/ "$RTDIR/dev"

	# Mount dir holding the zip (so that it doesn't take space on "/system"
	mkdir -p "$RTDIR/tmp_opengappzip"
	mount --bind "$(dirname "$ZIPFILE")" "$RTDIR/tmp_opengappzip"

	# Change pid_max to a value that suits the chroot
	PID_MAX_ORIG=$(cat /proc/sys/kernel/pid_max)
	echo -e "\nOriginal PID_Max was $PID_MAX_ORIG"
	echo "Run 'echo $PID_MAX_ORIG > /proc/sys/kernel/pid_max' to revert to it"
	echo 65500 > /proc/sys/kernel/pid_max

	echo -e "\nPreparing the chroot environment..."

	# Unpack busybox
	unzip -o "$RTDIR/tmp_opengappzip/$(basename "$ZIPFILE")" busybox-x86 -d "$RTDIR/tmp"
	mkdir -p "$RTDIR/tmp/bin"
	$RTDIR/tmp/busybox-x86 --install "$RTDIR/tmp/bin"

	# Copy patch & chroot script to chroot dir
	mkdir -p "$RTDIR/tmp/opengapps_in_emulator"
	cp "$SCRIPT_DIR/open_gapps_install_script.patch" "$RTDIR/tmp/opengapps_in_emulator"
	cp "$SCRIPT_DIR/open_gapps_install_script.chroot.sh" "$RTDIR/tmp/opengapps_in_emulator"
	chmod 755 "$SCRIPT_DIR/open_gapps_install_script.chroot.sh"

	# Run script in chroot
	echo -e "\nEntering the chroot environment to install OpenGApps..."
	PATH=/tmp/bin:/system/bin:$PATH chroot "$RTDIR" "/tmp/bin/bash" "/tmp/opengapps_in_emulator/open_gapps_install_script.chroot.sh" "$(basename "$ZIPFILE")"
	echo -e "\nLeaving chroot..."

	# Make a copy of the /data partition because we can't load it into the chroot
	#mkdir -p /tmp/my_avd_data
	#cp -a "$RTDIR/data/*" /tmp/my_avd_data/

	# Restore original pid_max
	echo $PID_MAX_ORIG > /proc/sys/kernel/pid_max

	# Unmount the images & cleanup
	echo -e "\nUnmouting the images..."
	umount "$RTDIR/tmp_opengappzip"
	rmdir "$RTDIR/tmp_opengappzip"
	if [ ! "a$ROOT_TMP_EXISTED" = "atrue" ]; then rmdir "$RTDIR/tmp" ; fi
	umount_img "$AVD_DIR/cache.img" "$RTDIR/cache"
	umount_img "$AVD_DIR/tmp/vendor.img" "$RTDIR/vendor"
	#umount_img "$RTDIR/data"
	umount "$RTDIR/proc"
	umount "$RTDIR/dev"
	if [[ "a$SYSIMG_IS_SYSTEM" == "atrue" ]]; then
	rmdir "$RTDIR/"{system,cache,vendor,proc,dev,tmp}
	umount_img "$AVD_DIR/tmp/system.img" "$RTDIR/system"
	else
	umount_img "$AVD_DIR/tmp/system.img" "$RTDIR"
	fi

	# Review the contents of the data partition, you may need to copy
	# things over through adb once the emulator is loaded (if this works)

	# adb push /tmp/my_avd_data/* /data
	# rm -r /tmp/my_avd_data/

	}

	upsize_extfs() {
	# $1 device path to the filesystem to upsize
	# $2 size

	"${ANDROID_SDK_ROOT}/emulator/bin64/e2fsck" -f "$1" 2> /dev/null
	if [ -z "$2" ]; then
	"${ANDROID_SDK_ROOT}/emulator/bin64/resize2fs" "$1" 2> /dev/null
	else
	"${ANDROID_SDK_ROOT}/emulator/bin64/resize2fs" "$1" "$2" 2> /dev/null
	fi
	}

	resize_img() {
	local image="$1"
	local size="$2"
	if file -b "$image" \| grep "DOS/MBR boot sector" > /dev/null; then
	# The system.img is not ext2/ext4 but a DOS/MBR boot sector which contains an ext2/3/4 fs
	echo -e "\nResizing sysem partition to $size... (you can safely ignore the warning 'The kernel is still using the old partition table.')"
	fallocate -l "$size" "$image"
	PART_UUID=$(sgdisk -i 1 "$image" \| grep "unique GUID" \| cut -d ' ' -f4)
	sgdisk -d 1 "$image"
	sgdisk -n 1:0:0 "$image"
	sgdisk -c 1:system "$image"
	sgdisk -u 1:$PART_UUID "$image"
	PART=$(kpartx -a -v "$image" \| cut -f 3 -d ' ')
	SYS_EXT_PART_PATH="/dev/mapper/$PART"
	upsize_extfs "$SYS_EXT_PART_PATH" ;
	kpartx -d -v "$image"
	echo "Resizing sysem partition to $size finished successfully!"
	elif file -b "$image" \| grep "ext. filesystem data" > /dev/null; then
	upsize_extfs "$image" "$size"
	else
	echo "$image format not supported by this script"
	exit 10;
	fi
	}

	unpack_images() {
	echo -e "\nUnpack original partition images for ${AVD}"
	mkdir -p "$AVD_DIR/tmp"
	if [ $(kpartx "${ANDROID_SDK_ROOT}/${IMAGE_SYSDIR}/system.img" \| wc -l) -gt 1 ]; then
	lptools_required
	# API 29 image (android Q) holding a super.img
	map_disk_img "${ANDROID_SDK_ROOT}/${IMAGE_SYSDIR}/system.img" 2
	"$LPTOOLS_BIN_DIR/lpunpack" --slot=0 -p system "$DEVICE" "$AVD_DIR/tmp"
	"$LPTOOLS_BIN_DIR/lpunpack" --slot=0 -p vendor "$DEVICE" "$AVD_DIR/tmp"
	"$LPTOOLS_BIN_DIR/lpdump" -j "$DEVICE" > "$AVD_DIR/tmp/lpdump.json"
	"$LPTOOLS_BIN_DIR/lpdump" "$DEVICE" > "$AVD_DIR/tmp/lpdump.txt"

	# Filesystems have the feature: EXT4_FEATURE_RO_COMPAT_SHARED_BLOCKS
	# We need to remove it to mount rw,
	# and at least resize the partition a bit if there is not enough space
	for img in system.img vendor.img; do
	FS_SIZE=$(wc -c "$AVD_DIR/tmp/$img" \| cut -f 1 -d ' ')
	e2fsck -f -y "$AVD_DIR/tmp/$img"
	# Increase size by 10% to be able to unshare_blocks
	resize2fs "$AVD_DIR/tmp/$img" $(( FS_SIZE * 11 / 10 / 1024 ))K
	e2fsck -y -E unshare_blocks "$AVD_DIR/tmp/$img" > /dev/null 2>&1
	e2fsck -f -y "$AVD_DIR/tmp/$img"
	done
	else
	cp "${ANDROID_SDK_ROOT}/${IMAGE_SYSDIR}/vendor.img" "${AVD_DIR}/tmp/vendor.img"
	cp "${ANDROID_SDK_ROOT}/${IMAGE_SYSDIR}/system.img" "${AVD_DIR}/tmp/system.img"
	fi
	if [ -f "${ANDROID_SDK_ROOT}/${IMAGE_SYSDIR}/encryptionkey.img" ]; then
	if [ ! -f "${AVD_DIR}/encryptionkey.img" ]; then
	echo "copying encryptionkey.img ..."
	cp "${ANDROID_SDK_ROOT}/${IMAGE_SYSDIR}/encryptionkey.img" "${AVD_DIR}/encryptionkey.img"
	fi
	fi
	}

	cleanup_avd() {
	rm -f "${AVD_DIR}/vendor.img"
	rm -f "${AVD_DIR}/system.img"
	rm -f "${AVD_DIR}/cache.img"
	rm -f "${AVD_DIR}/cache.img.qcow2"
	rm -f "${AVD_DIR}/userdata-qemu.img"
	rm -f "${AVD_DIR}/userdata-qemu.img.qcow2"
	rm -fr "${AVD_DIR}/snapshots/default_boot/"
	}

	disable_verified_boot_pre_q() {
	# On Android Pie, we disable it since we modify the system.img file. Otherwise the emulator will not boot.
	if [ -f "${ANDROID_SDK_ROOT}/${IMAGE_SYSDIR}/VerifiedBootParams.textproto" ] \
	&& grep "^dm_param" "${ANDROID_SDK_ROOT}/${IMAGE_SYSDIR}/VerifiedBootParams.textproto" > /dev/null ; then
	# If the file exists, maybe the emulator has Verity/Verified boot enabled.
	if [ ! -f "${AVD_DIR}/VerifiedBootParams.textproto" ]; then
	echo "copying VerifiedBootParams.textproto..."
	cp "${ANDROID_SDK_ROOT}/${IMAGE_SYSDIR}/VerifiedBootParams.textproto" "${AVD_DIR}/VerifiedBootParams.textproto"
	fi
	echo "Disabling verity/verified-boot..."
	sed -i -e "s/^dm_param/#dm_param/" "${AVD_DIR}/VerifiedBootParams.textproto"
	fi
	}

	lptools_required() {
	if [ ! -e $LPTOOLS_BIN_DIR/lpmake ] \|\| [ ! -e $LPTOOLS_BIN_DIR/lpmake ] \|\| [ ! -e $LPTOOLS_BIN_DIR/lpmake ]; then
	echo "lpmake, lpdump and lpunpack are missing. Get them and check LPTOOLS_BIN_DIR in the script "
	echo "Packaged sources (including the minimal android sources to build): https://github.com/LonelyFool/lpunpack_and_lpmake"
	echo "Upstream sources (needs all android sources): https://android.googlesource.com/platform/system/extras/+/refs/heads/master/partition_tools/"
	exit 8
	fi
	}

	repack_images() {

	# No need to repack if this is not a combined_img (appeard in android Q)
	if [ $(kpartx "${ANDROID_SDK_ROOT}/${IMAGE_SYSDIR}/system.img" \| wc -l) -le 1 ]; then return 0; fi

	# Build the dynamic partiton system.img and the avb/verity/verified-boot related files/hases for android Q+ (10+)

	lptools_required

	if [ ! -e $FEC_BINARY ]; then
	echo "fec binary missing. Get them and check FEC_BINARY in the script "
	echo "prebuild binary can be found in the otatools here: https://forum.xda-developers.com/t/guide-ota-tools-lpunpack.4041843/"
	exit 8
	fi

	# Doc for verified boot:
	# https://android.googlesource.com/platform/external/avb/+/master/README.md

	# Download & extract some required scripts & files from anroid sources:
	wget -nc https://android.googlesource.com/platform/external/avb/+archive/master.tar.gz -O "$TEMPDIR/avbtool.tar.gz"
	tar -xvf "$TEMPDIR/avbtool.tar.gz" -C "$TEMPDIR" \
	avbtool.py \
	test/data/testkey_rsa2048.pem \
	test/data/testkey_rsa4096.pem
	chmod +x "$TEMPDIR/avbtool.py"
	mv "$TEMPDIR/test/data/testkey_rsa2048.pem" "$TEMPDIR/"
	mv "$TEMPDIR/test/data/testkey_rsa4096.pem" "$TEMPDIR/"
	rmdir "$TEMPDIR/test/data"
	rmdir "$TEMPDIR/test"

	# https://cs.android.com/android/platform/superproject/+/master:device/generic/goldfish/tools/mk_vbmeta_boot_params.sh
	# https://cs.android.com/android/platform/superproject/+/master:device/generic/goldfish/tools/mk_combined_img.py
	wget -nc https://android.googlesource.com/device/generic/goldfish/+archive/refs/heads/master/tools.tar.gz -O "$TEMPDIR/goldfish_tools.tar.gz"
	tar -xvf "$TEMPDIR/goldfish_tools.tar.gz" -C "$TEMPDIR" \
	mk_vbmeta_boot_params.sh \
	mk_combined_img.py
	chmod +x "$TEMPDIR/mk_vbmeta_boot_params.sh"
	chmod +x "$TEMPDIR/mk_combined_img.py"

	# Add Hashtree footer to the images
	# We need the binary of "fec"
	# Sources: here http://www.ka9q.net/code/fec/ or there https://android.googlesource.com/platform/external/fec/+/master/)
	# Binary in otatools
	#$TEMPDIR/avbtool.py erase_footer --image "${AVD_DIR}/tmp/vendor.img"
	PATH=$PATH:$FEC_PATH "$TEMPDIR/avbtool.py" add_hashtree_footer \
	--partition_name vendor \
	--partition_size 0 \
	--image "${AVD_DIR}/tmp/vendor.img"
	#--prop com.android.build.system.os_version:10

	"$TEMPDIR/avbtool.py" info_image --image "${AVD_DIR}/tmp/vendor.img"
	"$TEMPDIR/avbtool.py" verify_image --image "${AVD_DIR}/tmp/vendor.img"

	#"$TEMPDIR/avbtool.py" erase_footer --image "${AVD_DIR}/tmp/system.img"
	# We skip the rollback index value (--rollback-index)
	PATH=$PATH:$FEC_PATH "$TEMPDIR/avbtool.py" add_hashtree_footer \
	--partition_name system \
	--partition_size 0 \
	--image "${AVD_DIR}/tmp/system.img" \
	--algorithm SHA256_RSA2048 \
	--key "$TEMPDIR/testkey_rsa2048.pem"
	#--prop com.android.build.system.os_version:10 \
	#--prop com.android.build.system.security_patch:2019-09-05

	"$TEMPDIR/avbtool.py" info_image --image "${AVD_DIR}/tmp/system.img"
	"$TEMPDIR/avbtool.py" verify_image --image "${AVD_DIR}/tmp/system.img" --key "$TEMPDIR/testkey_rsa2048.pem"

	"$TEMPDIR/avbtool.py" extract_public_key --key "$TEMPDIR/testkey_rsa2048.pem" --output "$TEMPDIR/system_rsa2048.avbpubkey"

	# Create vbmeta image with dm-verity disabled
	# https://wiki.postmarketos.org/wiki/Android_Verified_Boot_(AVB)
	# "$TEMPDIR/avbtool.py" make_vbmeta_image \
	# --flags 2 \
	# --padding_size 4096 \
	# --output ${AVD_DIR}/tmp/vbmeta_disabled.img \
	# --chain_partition system:1:$TEMPDIR/system_rsa2048.avbpubkey

	# Remove old vbmeta.img, then create vbmeta image
	rm -f "${AVD_DIR}/tmp/vbmeta.img"
	"$TEMPDIR/avbtool.py" make_vbmeta_image \
	--algorithm SHA256_RSA4096 \
	--key "$TEMPDIR/testkey_rsa4096.pem" \
	--padding_size 4096 \
	--output "${AVD_DIR}/tmp/vbmeta.img" \
	--chain_partition system:1:$TEMPDIR/system_rsa2048.avbpubkey \
	--include_descriptors_from_image "${AVD_DIR}/tmp/vendor.img"

	"$TEMPDIR/avbtool.py" info_image --image "${AVD_DIR}/tmp/vbmeta.img"
	"$TEMPDIR/avbtool.py" verify_image --image "${AVD_DIR}/tmp/vbmeta.img" \
	--expected_chain_partition system:1:$TEMPDIR/system_rsa2048.avbpubkey \
	--key "$TEMPDIR/testkey_rsa4096.pem"

	# Create VerifiedBootParams.textproto
	AVBTOOL="$(realpath "$TEMPDIR/avbtool.py")" "$TEMPDIR/mk_vbmeta_boot_params.sh" \
	"${AVD_DIR}/tmp/vbmeta.img" \
	"${AVD_DIR}/tmp/system.img" \
	"${AVD_DIR}/tmp/VerifiedBootParams.textproto"
	mv "${AVD_DIR}/tmp/VerifiedBootParams.textproto" "${AVD_DIR}/VerifiedBootParams.textproto"

	# Prepare variables to repack super.img with lpmake
	REPLICATE_LPDUMP=0
	if [[ $REPLICATE_LPDUMP -eq 1 ]]; then
	LPMAKE_DEVICE_SIZE=$(jq -r '.block_devices[0].size' "$AVD_DIR/tmp/lpdump.json")
	LPMAKE_SUPER_NAME=$(jq -r '.block_devices[0].name' "$AVD_DIR/tmp/lpdump.json")
	LPMAKE_ALIGNMENT=$(jq -r '.block_devices[0].alignment' "$AVD_DIR/tmp/lpdump.json")
	LPMAKE_BLOCK_SIZE=$(jq -r '.block_devices[0].block_size' "$AVD_DIR/tmp/lpdump.json")
	LPMAKE_GROUP_NAME=$(jq -r '.partitions[0].group_name' "$AVD_DIR/tmp/lpdump.json")
	LPMAKE_METADATA_SIZE=$(cat "$AVD_DIR/tmp/lpdump.txt" \| grep "Metadata max size:" \| cut -d ' ' -f 4)
	LPMAKE_METADATA_SLOTS=$(cat "$AVD_DIR/tmp/lpdump.txt" \| grep "Metadata slot count:" \| cut -d ' ' -f 4)
	LPMAKE_PART_SYSTEM_SIZE=$(jq -r '.partitions[] \| select(.name \| contains("system")).size ' "$AVD_DIR/tmp/lpdump.json")
	LPMAKE_PART_VENDOR_SIZE=$(jq -r '.partitions[] \| select(.name \| contains("vendor")).size ' "$AVD_DIR/tmp/lpdump.json")
	LPMAKE_GROUP_MAX_SIZE=$(jq -r '.groups[] \| select(.name \| contains ("'$LPMAKE_GROUP_NAME'")).maximum_size' "$AVD_DIR/tmp/lpdump.json")
	else
	LPMAKE_SUPER_NAME=$(jq -r '.block_devices[0].name' "$AVD_DIR/tmp/lpdump.json")
	LPMAKE_ALIGNMENT=$(jq -r '.block_devices[0].alignment' "$AVD_DIR/tmp/lpdump.json")
	LPMAKE_BLOCK_SIZE=$(jq -r '.block_devices[0].block_size' "$AVD_DIR/tmp/lpdump.json")
	LPMAKE_GROUP_NAME=$(jq -r '.partitions[0].group_name' "$AVD_DIR/tmp/lpdump.json")
	LPMAKE_METADATA_SIZE=$(cat "$AVD_DIR/tmp/lpdump.txt" \| grep "Metadata max size:" \| cut -d ' ' -f 4)
	LPMAKE_METADATA_SLOTS=$(cat "$AVD_DIR/tmp/lpdump.txt" \| grep "Metadata slot count:" \| cut -d ' ' -f 4)
	LPMAKE_PART_SYSTEM_SIZE=$(wc -c "$AVD_DIR/tmp/system.img" \| cut -f 1 -d ' ')
	LPMAKE_PART_VENDOR_SIZE=$(wc -c "$AVD_DIR/tmp/vendor.img" \| cut -f 1 -d ' ')
	# LPMAKE_GROUP_MAX_SIZE: round size to multiple of 1024*1024 (size of all partitions + 2MiB)
	LPMAKE_GROUP_MAX_SIZE=$(( ( ( ( LPMAKE_PART_SYSTEM_SIZE + LPMAKE_PART_VENDOR_SIZE ) / 1024 / 1024 ) + 2 ) * 1024 * 1024))
	# LPMAKE_DEVICE_SIZE = LPMAKE_GROUP_MAX_SIZE + 8MiB
	LPMAKE_DEVICE_SIZE=$(( LPMAKE_GROUP_MAX_SIZE + ( 8 * 1024 * 1024 ) ))
	#LPMAKE_DEVICE_SIZE=$(( $(jq -r '.block_devices[0].size' "$AVD_DIR/tmp/lpdump.json") + (100 * 1024 * 1024) ))
	fi

	# Repack the super.img
	"$LPTOOLS_BIN_DIR/lpmake" \
	--device-size=$LPMAKE_DEVICE_SIZE \
	--metadata-size=$LPMAKE_METADATA_SIZE \
	--metadata-slots=$LPMAKE_METADATA_SLOTS \
	--output="${AVD_DIR}/tmp/super.img" \
	-p system:readonly:$LPMAKE_PART_SYSTEM_SIZE:$LPMAKE_GROUP_NAME \
	-i system="${AVD_DIR}/tmp/system.img" \
	-p vendor:readonly:$LPMAKE_PART_VENDOR_SIZE:$LPMAKE_GROUP_NAME \
	-i vendor="${AVD_DIR}/tmp/vendor.img" \
	--block-size=$LPMAKE_BLOCK_SIZE \
	--alignment=$LPMAKE_ALIGNMENT \
	--super-name="$LPMAKE_SUPER_NAME" \
	--group=$LPMAKE_GROUP_NAME:$LPMAKE_GROUP_MAX_SIZE

	# Delete system.img & vendor.img (we now have super.img)
	#for img in system.img vendor.img; do
	# rm "${AVD_DIR}/tmp/$img"
	#done

	if [[ $REPLICATE_LPDUMP -eq 1 ]]; then
	dd if="${DEVICE::-1}1" of="${AVD_DIR}/vbmeta.img"
	fi

	# Prepare image_config file to build the combined img that will be used as system.img for the emulator
	echo "${AVD_DIR}/tmp/vbmeta.img vbmeta 1" > "${AVD_DIR}/tmp/image_config"
	echo "${AVD_DIR}/tmp/super.img super 2" >> "${AVD_DIR}/tmp/image_config"

	# Fix incorrect arguments when calling sgdisk (replace --type= by --typecode= )
	sed -i -e "s/--type=/--typecode=/" "$TEMPDIR/mk_combined_img.py"

	# Remove previous image (because the mk_combined_img.py behaves differently if the file already exists)
	# Then, create the combined image
	rm -f "${AVD_DIR}/tmp/combined.img"
	"$TEMPDIR/mk_combined_img.py" -i "${AVD_DIR}/tmp/image_config" -o "${AVD_DIR}/tmp/combined.img"

	# Cleanup
	rm "${AVD_DIR}/tmp/image_config"
	rm "${AVD_DIR}/tmp/vbmeta.img"
	rm "${AVD_DIR}/tmp/super.img"
	rm "${AVD_DIR}/tmp/lpdump.json"
	rm "${AVD_DIR}/tmp/lpdump.txt"


	# Some variables set in Android Makefile
	#BOARD_AVB_ENABLE := true
	#BOARD_AVB_ALGORITHM := SHA256_RSA4096
	#BOARD_AVB_KEY_PATH := external/avb/test/data/$TEMPDIR/testkey_rsa4096.pem
	# Enable chain partition for system. https://cs.android.com/android/platform/superproject/+/master:build/make/target/board/BoardConfigEmuCommon.mk;l=82?q=BOARD_AVB_SYSTEM_KEY_PATH&ss=android%2Fplatform%2Fsuperproject
	#BOARD_AVB_SYSTEM_KEY_PATH := external/avb/test/data/$TEMPDIR/testkey_rsa2048.pem
	#BOARD_AVB_SYSTEM_ALGORITHM := SHA256_RSA2048
	#BOARD_AVB_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
	#BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 1
	#BOARD_SUPER_PARTITION_SIZE := 3229614080

	}

	########## Functions END #############

	echo "Which AVD?"
	sudo -u "$USERNAME" "${ANDROID_SDK_ROOT}/emulator/emulator" -list-avds
	echo -en "\n>"
	read -r AVD

	AVD_DIR=$(grep "path=" "${USER_HOME}/.android/avd/${AVD}.ini" \| cut -f2 -d"=")
	AVD_DIR=${AVD_DIR// } # trim

	echo -en "\ndetermining location of system.img file for ${AVD} ... "
	IMAGE_SYSDIR=$(grep "image.sysdir.1" "${AVD_DIR}/config.ini" \| cut -f2 -d"=")
	IMAGE_SYSDIR=${IMAGE_SYSDIR// } # trim
	echo "${ANDROID_SDK_ROOT}/${IMAGE_SYSDIR}"

	# Cleanup current avd instance
	cleanup_avd

	# Copy clean system.img to selected AVD and related stuff
	unpack_images

	# Resize system.img
	resize_img "${AVD_DIR}/tmp/system.img" "3072M"

	# Install with the OpenGApps installer in a chroot environment
	install_with_opengapps_installer

	# Repack images
	repack_images

	# Disable verfied boot (for version before Android-Q)
	disable_verified_boot_pre_q

	# Resize data partition
	sed -i -e "s/disk.dataPartition.size.*/disk.dataPartition.size=1536M/" "${AVD_DIR}/config.ini"

	# Install the built images into the avd
	if [ $(kpartx "${ANDROID_SDK_ROOT}/${IMAGE_SYSDIR}/system.img" \| wc -l) -le 1 ]; then
	mv "${AVD_DIR}/tmp/system.img" "${AVD_DIR}"
	mv "${AVD_DIR}/tmp/vendor.img" "${AVD_DIR}"
	else
	# Move combined.img to system.img for use by the emulator
	mv "${AVD_DIR}/tmp/combined.img" "${AVD_DIR}/system.img"
	fi

	rm -r "$TEMPDIR"
	rmdir "${AVD_DIR}/tmp"