edea842b6a
Reason for revert: errors Original issue's description: > Improve Android scripts: > > * android_gdbserver: > - Don't complain if $GDB_TMP_DIR already exists > - Since $GDB_TMP_DIR/gdb.setup might already exist, overwrite the file. > > * android_run_skia: > - Move resource files onto the device. > - Change to tmp directory before executing program. > > * android_make, android_setup: > - stop assuming PWD is skia source directory. > > NOTRY=true > > Committed: http://code.google.com/p/skia/source/detail?r=14442 R=djsollen@google.com, scroggo@google.com TBR=djsollen@google.com, scroggo@google.com NOTREECHECKS=true NOTRY=true Author: halcanary@google.com Review URL: https://codereview.chromium.org/254073003 git-svn-id: http://skia.googlecode.com/svn/trunk@14448 2bbb7eff-a529-9590-31e7-b0007b416f81
36 lines
1.2 KiB
Bash
Executable File
36 lines
1.2 KiB
Bash
Executable File
#!/bin/bash
|
|
#
|
|
# android_run_skia: starts the correct skia program on the device, prints the
|
|
# output, and kills the app if interrupted.
|
|
|
|
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
|
source $SCRIPT_DIR/android_setup.sh
|
|
source $SCRIPT_DIR/utils/setup_adb.sh
|
|
|
|
if [ ! -f "${SKIA_OUT}/$BUILDTYPE/lib/lib${APP_ARGS[0]}.so" ];
|
|
then
|
|
echo "Unable to find $BUILDTYPE ${APP_ARGS[0]} library"
|
|
exit 1
|
|
fi
|
|
|
|
adb_push_if_needed "${SKIA_OUT}/$BUILDTYPE/skia_launcher" /data/local/tmp
|
|
if [ -f "${SKIA_OUT}/$BUILDTYPE/lib/libskia_android.so" ]; then
|
|
# Does not exist for builds with static skia.
|
|
adb_push_if_needed "${SKIA_OUT}/$BUILDTYPE/lib/libskia_android.so" /data/local/tmp
|
|
fi
|
|
adb_push_if_needed "${SKIA_OUT}/$BUILDTYPE/lib/lib${APP_ARGS[0]}.so" /data/local/tmp
|
|
|
|
STATUS_FILENAME="/data/local/tmp/.skia_tmp_$(date +%s%N)"
|
|
$ADB ${DEVICE_SERIAL} shell \
|
|
"/data/local/tmp/skia_launcher ${APP_ARGS[@]}; echo \$? > ${STATUS_FILENAME}"
|
|
if [ -z "$($ADB $DEVICE_SERIAL shell 'if [ -f $STATUS_FILENAME ]; then echo exists; fi')" ]; then
|
|
exit 1
|
|
fi
|
|
EXIT_CODE=`$ADB ${DEVICE_SERIAL} shell cat ${STATUS_FILENAME}`
|
|
$ADB ${DEVICE_SERIAL} shell rm ${STATUS_FILENAME}
|
|
echo "EXIT_CODE is ${EXIT_CODE}"
|
|
if [ $'0\r' != "${EXIT_CODE}" ]; then
|
|
exit 1
|
|
fi
|
|
exit 0
|