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

Commit 168be967 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

Change-Id: I248e96898c155c019e0af826b92520f373e3773e
parents 4d03a384 d2353d03
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -1026,7 +1026,7 @@ elif [ "${ANDROID_PRODUCT_OUT}" = "${ANDROID_PRODUCT_OUT%*/${H}}" ]; then
elif [ -z "${ANDROID_HOST_OUT}" ]; then
  echo "${ORANGE}[  WARNING ]${NORMAL} please run lunch, skipping"
else
  adb reboot-fastboot ||
  adb reboot fastboot ||
    die "fastbootd not supported (wrong adb in path?)"
  any_wait 2m &&
    inFastboot ||
@@ -1136,7 +1136,7 @@ if [ -n "${scratch_partition}" ]; then

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

  adb reboot-fastboot ||
  adb reboot fastboot ||
    die "Reboot into fastbootd"
  img=${TMPDIR}/adb-remount-test-${$}.img
  cleanup() {