Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(612)

Side by Side Diff: platform_tools/android/bin/android_run_skia

Issue 24770002: Fix android_run_skia (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 15 matching lines...) Expand all
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 adb_push_if_needed "${SKIA_OUT}/${configuration}/lib.target/libskia_android.so" /data/local/tmp
32 adb_push_if_needed "${SKIA_OUT}/${configuration}/lib.target/lib${runVars[0]}.so" /data/local/tmp 32 adb_push_if_needed "${SKIA_OUT}/${configuration}/lib.target/lib${runVars[0]}.so" /data/local/tmp
33 33
34 STATUS_FILENAME="/data/local/tmp/.skia_tmp_$(date +%s%N)" 34 STATUS_FILENAME="/data/local/tmp/.skia_tmp_$(date +%s%N)"
35 $ADB ${DEVICE_SERIAL} shell "/data/local/tmp/skia_launcher ${runVars[@]}; echo \ $? > ${STATUS_FILENAME}" 35 $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
37 exit 1
38 fi
36 EXIT_CODE=`$ADB ${DEVICE_SERIAL} shell cat ${STATUS_FILENAME}` 39 EXIT_CODE=`$ADB ${DEVICE_SERIAL} shell cat ${STATUS_FILENAME}`
37 $ADB ${DEVICE_SERIAL} shell rm ${STATUS_FILENAME} 40 $ADB ${DEVICE_SERIAL} shell rm ${STATUS_FILENAME}
38 if [ $'0\r' != ${EXIT_CODE} ]; then 41 if [ $'0\r' != ${EXIT_CODE} ]; then
39 exit 1 42 exit 1
40 fi 43 fi
41 exit 0 44 exit 0
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698