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

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

Issue 387893003: explicitly add /data/local/tmp to the library path to support new AOSP restrictions (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 5 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
« 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 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 22 if [[ -n $RESOURCE_PATH ]]; then
23 adb_push_if_needed "${SKIA_SRC_DIR}/resources" $RESOURCE_PATH 23 adb_push_if_needed "${SKIA_SRC_DIR}/resources" $RESOURCE_PATH
24 fi 24 fi
25 25
26 STATUS_FILENAME="/data/local/tmp/.skia_tmp_$(date +%s%N)" 26 STATUS_FILENAME="/data/local/tmp/.skia_tmp_$(date +%s%N)"
27 $ADB ${DEVICE_SERIAL} shell \ 27 $ADB ${DEVICE_SERIAL} shell \
28 "/data/local/tmp/skia_launcher ${APP_ARGS[*]}; echo \$? > ${STATUS_FILENAME} " 28 "LD_LIBRARY_PATH=/data/local/tmp:$LD_LIBRARY_PATH \
29 /data/local/tmp/skia_launcher ${APP_ARGS[*]}; echo \$? > ${STATUS_FILENAME} "
29 if [ -z "$($ADB $DEVICE_SERIAL shell 'if [ -f $STATUS_FILENAME ]; then echo exis ts; fi')" ]; then 30 if [ -z "$($ADB $DEVICE_SERIAL shell 'if [ -f $STATUS_FILENAME ]; then echo exis ts; fi')" ]; then
30 echo "***********************************************************************" 31 echo "***********************************************************************"
31 echo "The application terminated unexpectedly and did not produce an exit code " 32 echo "The application terminated unexpectedly and did not produce an exit code "
32 echo "***********************************************************************" 33 echo "***********************************************************************"
33 exit 1 34 exit 1
34 fi 35 fi
35 36
36 EXIT_CODE=`$ADB ${DEVICE_SERIAL} shell cat ${STATUS_FILENAME}` 37 EXIT_CODE=`$ADB ${DEVICE_SERIAL} shell cat ${STATUS_FILENAME}`
37 $ADB ${DEVICE_SERIAL} shell rm -f ${STATUS_FILENAME} 38 $ADB ${DEVICE_SERIAL} shell rm -f ${STATUS_FILENAME}
38 39
39 # check to see if the 'cat' command failed and print errors accordingly 40 # check to see if the 'cat' command failed and print errors accordingly
40 if [[ ${EXIT_CODE} == *${STATUS_FILENAME}* ]]; then 41 if [[ ${EXIT_CODE} == *${STATUS_FILENAME}* ]]; then
41 echo "***********************************************************************" 42 echo "***********************************************************************"
42 echo "ADB failed to retrieve the application's exit code" 43 echo "ADB failed to retrieve the application's exit code"
43 echo "***********************************************************************" 44 echo "***********************************************************************"
44 exit 1 45 exit 1
45 fi 46 fi
46 47
47 echo "EXIT_CODE is ${EXIT_CODE}" 48 echo "EXIT_CODE is ${EXIT_CODE}"
48 if [ $'0\r' != "${EXIT_CODE}" ]; then 49 if [ $'0\r' != "${EXIT_CODE}" ]; then
49 exit 1 50 exit 1
50 fi 51 fi
51 exit 0 52 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