ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Replace reboot-fastboot by reboot fastboot" am: cd68bda4ec

Browse source 
am: d2353d030f

Change-Id: I248e96898c155c019e0af826b92520f373e3773e
This commit is contained in:
Julien Desprez 2019-04-03 02:30:33 -07:00 • committed by android-build-merger
commit 168be967f5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs_mgr/tests/adb-remount-test.sh
View file

@ -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() {