| OLD | NEW |
| 1 #!/bin/bash | 1 #!/bin/bash |
| 2 # | 2 # |
| 3 # android_run_skia: starts the correct skia program on the device, prints the | 3 # android_run_skia: starts the correct skia program on the device, prints the |
| 4 # output, and kills the app if interrupted. | 4 # output, and kills the app if interrupted. |
| 5 | 5 |
| 6 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" | 6 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" |
| 7 source $SCRIPT_DIR/android_setup.sh | 7 source $SCRIPT_DIR/android_setup.sh |
| 8 source $SCRIPT_DIR/utils/setup_adb.sh | 8 source $SCRIPT_DIR/utils/setup_adb.sh |
| 9 | 9 |
| 10 configuration="Debug" | 10 configuration="Debug" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 fi | 34 fi |
| 35 adb_push_if_needed "${SKIA_OUT}/${configuration}/lib.target/lib${runVars[0]}.so"
/data/local/tmp | 35 adb_push_if_needed "${SKIA_OUT}/${configuration}/lib.target/lib${runVars[0]}.so"
/data/local/tmp |
| 36 | 36 |
| 37 STATUS_FILENAME="/data/local/tmp/.skia_tmp_$(date +%s%N)" | 37 STATUS_FILENAME="/data/local/tmp/.skia_tmp_$(date +%s%N)" |
| 38 $ADB ${DEVICE_SERIAL} shell "/data/local/tmp/skia_launcher ${runVars[@]}; echo \
$? > ${STATUS_FILENAME}" | 38 $ADB ${DEVICE_SERIAL} shell "/data/local/tmp/skia_launcher ${runVars[@]}; echo \
$? > ${STATUS_FILENAME}" |
| 39 if [ -z "$($ADB $DEVICE_SERIAL shell 'if [ -f $STATUS_FILENAME ]; then echo exis
ts; fi')" ]; then | 39 if [ -z "$($ADB $DEVICE_SERIAL shell 'if [ -f $STATUS_FILENAME ]; then echo exis
ts; fi')" ]; then |
| 40 exit 1 | 40 exit 1 |
| 41 fi | 41 fi |
| 42 EXIT_CODE=`$ADB ${DEVICE_SERIAL} shell cat ${STATUS_FILENAME}` | 42 EXIT_CODE=`$ADB ${DEVICE_SERIAL} shell cat ${STATUS_FILENAME}` |
| 43 $ADB ${DEVICE_SERIAL} shell rm ${STATUS_FILENAME} | 43 $ADB ${DEVICE_SERIAL} shell rm ${STATUS_FILENAME} |
| 44 echo "EXIT_CODE is [${EXIT_CODE}]" |
| 44 if [ $'0\r' != ${EXIT_CODE} ]; then | 45 if [ $'0\r' != ${EXIT_CODE} ]; then |
| 45 exit 1 | 46 exit 1 |
| 46 fi | 47 fi |
| 47 exit 0 | 48 exit 0 |
| OLD | NEW |