48f9e1f2c1
android_ninja {tests,bench,gm,bench_pictures,render_pictures} all build and run
fine. They build so fast I thought maybe they were broken.
Note that android_ninja with no argument is failing:
ninja: Entering directory `out/config/android-arm_v7_thumb/Debug'
ninja: error: 'lib.target/libSampleApp.so', needed by 'android/libs/armeabi-v7a/libSampleApp.so', missing and no known rule to make it
Will look into this.
BUG=
R=djsollen@google.com
Committed: https://code.google.com/p/skia/source/detail?r=11525
Review URL: https://codereview.chromium.org/24833002
git-svn-id: http://skia.googlecode.com/svn/trunk@11527 2bbb7eff-a529-9590-31e7-b0007b416f81
27 lines
907 B
Bash
Executable File
27 lines
907 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="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
|
source $SCRIPT_DIR/android_setup.sh
|
|
|
|
if [ $(basename $0) = "android_make" ]; then
|
|
GYP_GENERATORS=make-android make $APP_ARGS
|
|
else
|
|
GYP_GENERATORS=ninja ./gyp_skia
|
|
OUT=$SKIA_OUT/${BUILDTYPE-Debug} # Defaults to Debug if BUILDTYPE isn't set.
|
|
ninja -C $OUT $APP_ARGS
|
|
ln -sf lib $OUT/lib.target # android_run_skia looks in lib.target; ninja writes to lib.
|
|
fi
|
|
|
|
# Write the device id into the .android_config file. This tells
|
|
# android_run_skia the last build we completed.
|
|
echo $DEVICE_ID > .android_config
|
|
|