Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3ec311a authored by Julien Desprez's avatar Julien Desprez Committed by android-build-merger
Browse files

Merge "Replace reboot-fastboot by reboot fastboot" am: cd68bda4 am: d2353d03 

am: 168be967

Change-Id: I32b6726dc8b03bf04a161ea3b8ced5aa29dfb923
parents 50a70173 168be967

fs_mgr/tests/adb-remount-test.sh

+2 −2
Original line number Original line Diff line number Diff line
@@ -1026,7 +1026,7 @@ elif [ "${ANDROID_PRODUCT_OUT}" = "${ANDROID_PRODUCT_OUT%*/${H}}" ]; then 
elif [ -z "${ANDROID_HOST_OUT}" ]; then

elif [ -z "${ANDROID_HOST_OUT}" ]; then

  echo "${ORANGE}[  WARNING ]${NORMAL} please run lunch, skipping"

  echo "${ORANGE}[  WARNING ]${NORMAL} please run lunch, skipping"

else

else

  adb reboot-fastboot ||

  adb reboot fastboot ||

    die "fastbootd not supported (wrong adb in path?)"

    die "fastbootd not supported (wrong adb in path?)"

  any_wait 2m &&

  any_wait 2m &&

    inFastboot ||

    inFastboot ||
@@ -1136,7 +1136,7 @@ if [ -n "${scratch_partition}" ]; then 




  echo "${GREEN}[ RUN      ]${NORMAL} test fastboot flash to ${scratch_partition} recovery" >&2

  echo "${GREEN}[ RUN      ]${NORMAL} test fastboot flash to ${scratch_partition} recovery" >&2





  adb reboot-fastboot ||

  adb reboot fastboot ||

    die "Reboot into fastbootd"

    die "Reboot into fastbootd"

  img=${TMPDIR}/adb-remount-test-${$}.img

  img=${TMPDIR}/adb-remount-test-${$}.img

  cleanup() {

  cleanup() {