| 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 if [ ! -f "${SKIA_OUT}/$BUILDTYPE/lib/lib${APP_ARGS[0]}.so" ]; | 10 if [ ! -f "${SKIA_OUT}/$BUILDTYPE/lib/lib${APP_ARGS[0]}.so" ]; |
| 11 then | 11 then |
| 12 echo "Unable to find $BUILDTYPE ${APP_ARGS[0]} library" | 12 echo "Unable to find $BUILDTYPE ${APP_ARGS[0]} library" |
| 13 exit 1 | 13 exit 1 |
| 14 fi | 14 fi |
| 15 | 15 |
| 16 adb_push_if_needed "${SKIA_OUT}/$BUILDTYPE/skia_launcher" /data/local/tmp | 16 adb_push_if_needed "${SKIA_OUT}/$BUILDTYPE/skia_launcher" /data/local/tmp |
| 17 if [ -f "${SKIA_OUT}/$BUILDTYPE/lib/libskia_android.so" ]; then | 17 if [ -f "${SKIA_OUT}/$BUILDTYPE/lib/libskia_android.so" ]; then |
| 18 # Does not exist for builds with static skia. | 18 # Does not exist for builds with static skia. |
| 19 adb_push_if_needed "${SKIA_OUT}/$BUILDTYPE/lib/libskia_android.so" /data/loc
al/tmp | 19 adb_push_if_needed "${SKIA_OUT}/$BUILDTYPE/lib/libskia_android.so" /data/loc
al/tmp |
| 20 fi | 20 fi |
| 21 adb_push_if_needed "${SKIA_OUT}/$BUILDTYPE/lib/lib${APP_ARGS[0]}.so" /data/local
/tmp | 21 adb_push_if_needed "${SKIA_OUT}/$BUILDTYPE/lib/lib${APP_ARGS[0]}.so" /data/local
/tmp |
| 22 if [[ -n $RESOURCE_PATH ]]; then |
| 23 adb_push_if_needed "${SKIA_SRC_DIR}/resources" $RESOURCE_PATH |
| 24 fi |
| 22 | 25 |
| 23 STATUS_FILENAME="/data/local/tmp/.skia_tmp_$(date +%s%N)" | 26 STATUS_FILENAME="/data/local/tmp/.skia_tmp_$(date +%s%N)" |
| 24 $ADB ${DEVICE_SERIAL} shell \ | 27 $ADB ${DEVICE_SERIAL} shell \ |
| 25 "/data/local/tmp/skia_launcher ${APP_ARGS[*]}; echo \$? > ${STATUS_FILENAME}
" | 28 "/data/local/tmp/skia_launcher ${APP_ARGS[*]}; echo \$? > ${STATUS_FILENAME}
" |
| 26 if [ -z "$($ADB $DEVICE_SERIAL shell 'if [ -f $STATUS_FILENAME ]; then echo exis
ts; fi')" ]; then | 29 if [ -z "$($ADB $DEVICE_SERIAL shell 'if [ -f $STATUS_FILENAME ]; then echo exis
ts; fi')" ]; then |
| 27 echo "***********************************************************************" | 30 echo "***********************************************************************" |
| 28 echo "The application terminated unexpectedly and did not produce an exit code
" | 31 echo "The application terminated unexpectedly and did not produce an exit code
" |
| 29 echo "***********************************************************************" | 32 echo "***********************************************************************" |
| 30 exit 1 | 33 exit 1 |
| 31 fi | 34 fi |
| 32 | 35 |
| 33 EXIT_CODE=`$ADB ${DEVICE_SERIAL} shell cat ${STATUS_FILENAME}` | 36 EXIT_CODE=`$ADB ${DEVICE_SERIAL} shell cat ${STATUS_FILENAME}` |
| 34 $ADB ${DEVICE_SERIAL} shell rm -f ${STATUS_FILENAME} | 37 $ADB ${DEVICE_SERIAL} shell rm -f ${STATUS_FILENAME} |
| 35 | 38 |
| 36 # check to see if the 'cat' command failed and print errors accordingly | 39 # check to see if the 'cat' command failed and print errors accordingly |
| 37 if [[ ${EXIT_CODE} == *${STATUS_FILENAME}* ]]; then | 40 if [[ ${EXIT_CODE} == *${STATUS_FILENAME}* ]]; then |
| 38 echo "***********************************************************************" | 41 echo "***********************************************************************" |
| 39 echo "ADB failed to retrieve the application's exit code" | 42 echo "ADB failed to retrieve the application's exit code" |
| 40 echo "***********************************************************************" | 43 echo "***********************************************************************" |
| 41 exit 1 | 44 exit 1 |
| 42 fi | 45 fi |
| 43 | 46 |
| 44 echo "EXIT_CODE is ${EXIT_CODE}" | 47 echo "EXIT_CODE is ${EXIT_CODE}" |
| 45 if [ $'0\r' != "${EXIT_CODE}" ]; then | 48 if [ $'0\r' != "${EXIT_CODE}" ]; then |
| 46 exit 1 | 49 exit 1 |
| 47 fi | 50 fi |
| 48 exit 0 | 51 exit 0 |
| OLD | NEW |