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
21 lines
624 B
Bash
Executable File
21 lines
624 B
Bash
Executable File
#!/bin/bash
|
|
|
|
# Fail-fast if anything in the script fails.
|
|
set -e
|
|
|
|
# Remove any existing .android_config file before running android_setup. If we
|
|
# did not remove this now then we would build for whatever device type was
|
|
# listed in the .android_config instead of the default device type.
|
|
rm -f .android_config
|
|
|
|
SCRIPT_DIR=$(dirname "${BASH_SOURCE[0]}")
|
|
source $SCRIPT_DIR/android_setup.sh
|
|
|
|
GYP_GENERATORS=ninja-android ./gyp_skia
|
|
ninja -C $SKIA_OUT/$BUILDTYPE ${APP_ARGS[@]}
|
|
|
|
# Write the device id into the .android_config file. This tells
|
|
# android_run_skia the last build we completed.
|
|
echo $DEVICE_ID > .android_config
|
|
|