| 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 10 matching lines...) Expand all Loading... |
| 21 shift | 21 shift |
| 22 done | 22 done |
| 23 | 23 |
| 24 if [ ! -f "${SKIA_OUT}/${configuration}/lib.target/lib${runVars[0]}.so" ]; | 24 if [ ! -f "${SKIA_OUT}/${configuration}/lib.target/lib${runVars[0]}.so" ]; |
| 25 then | 25 then |
| 26 echo "Unable to find the ${runVars[0]} library" | 26 echo "Unable to find the ${runVars[0]} library" |
| 27 exit 1 | 27 exit 1 |
| 28 fi | 28 fi |
| 29 | 29 |
| 30 adb_push_if_needed "${SKIA_OUT}/${configuration}/skia_launcher" /data/local/tmp | 30 adb_push_if_needed "${SKIA_OUT}/${configuration}/skia_launcher" /data/local/tmp |
| 31 adb_push_if_needed "${SKIA_OUT}/${configuration}/lib.target/libskia_android.so"
/data/local/tmp | 31 if [ -f "${SKIA_OUT}/${configuration}/lib.target/libskia_android.so" ]; then |
| 32 # Does not exist for builds with static skia. |
| 33 adb_push_if_needed "${SKIA_OUT}/${configuration}/lib.target/libskia_android.
so" /data/local/tmp |
| 34 fi |
| 32 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 |
| 33 | 36 |
| 34 STATUS_FILENAME="/data/local/tmp/.skia_tmp_$(date +%s%N)" | 37 STATUS_FILENAME="/data/local/tmp/.skia_tmp_$(date +%s%N)" |
| 35 $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}" |
| 36 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 |
| 37 exit 1 | 40 exit 1 |
| 38 fi | 41 fi |
| 39 EXIT_CODE=`$ADB ${DEVICE_SERIAL} shell cat ${STATUS_FILENAME}` | 42 EXIT_CODE=`$ADB ${DEVICE_SERIAL} shell cat ${STATUS_FILENAME}` |
| 40 $ADB ${DEVICE_SERIAL} shell rm ${STATUS_FILENAME} | 43 $ADB ${DEVICE_SERIAL} shell rm ${STATUS_FILENAME} |
| 41 if [ $'0\r' != ${EXIT_CODE} ]; then | 44 if [ $'0\r' != ${EXIT_CODE} ]; then |
| 42 exit 1 | 45 exit 1 |
| 43 fi | 46 fi |
| 44 exit 0 | 47 exit 0 |
| OLD | NEW |