Fix strange failures on Android N
We were seeing problems where dm ended with exit code 0, but the step still failed.
It seems they changed what N returns when a thing completes.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2319843003
TBR=bugsbunny
Review-Url: https://codereview.chromium.org/2319843003
diff --git a/infra/bots/recipe_modules/flavor/android_flavor.py b/infra/bots/recipe_modules/flavor/android_flavor.py
index dff11dd..93347e4 100644
--- a/infra/bots/recipe_modules/flavor/android_flavor.py
+++ b/infra/bots/recipe_modules/flavor/android_flavor.py
@@ -38,7 +38,7 @@
'Nexus10': 'arm_v7_neon',
'Nexus5': 'arm_v7_neon',
'Nexus6': 'arm_v7_neon',
- 'Nexus6p': 'arm_v7_neon',
+ 'Nexus6p': 'arm64',
'Nexus7': 'arm_v7_neon',
'Nexus7v2': 'arm_v7_neon',
'Nexus9': 'arm64',
diff --git a/platform_tools/android/bin/android_run_skia b/platform_tools/android/bin/android_run_skia
index 95d9fd9..c4e9056 100755
--- a/platform_tools/android/bin/android_run_skia
+++ b/platform_tools/android/bin/android_run_skia
@@ -27,7 +27,7 @@
fi
if [ $LOGCAT ]; then
- verbose "clearing the device logs..."
+ verbose "clearing the device logs..."
$ADB $DEVICE_SERIAL logcat -c;
fi
STATUS_FILENAME="/data/local/tmp/.skia_tmp_$(date +%s%N)"
@@ -44,7 +44,7 @@
rm ${CMD_FILENAME}
verbose "preparing to run ${APP_ARGS[0]} on the device..."
$ADB ${DEVICE_SERIAL} shell sh /data/local/tmp/${CMD_FILENAME}
-
+
if [ -z "$($ADB $DEVICE_SERIAL shell 'if [ -f $STATUS_FILENAME ]; then echo exists; fi')" ]; then
if [ $LOGCAT ]; then $ADB $DEVICE_SERIAL logcat -d; fi
echo "***********************************************************************"
@@ -66,7 +66,7 @@
fi
echo "EXIT_CODE is ${EXIT_CODE}"
-if [ $'0\r' != "${EXIT_CODE}" ]; then
+if [[ "${EXIT_CODE}" != 0* ]]; then
if [ $LOGCAT ]; then $ADB $DEVICE_SERIAL logcat -d; fi
exit 1
fi