OLD | NEW |
---|---|
1 #!/bin/bash | 1 #!/bin/bash |
2 | 2 |
3 # Fail-fast if anything in the script fails. | 3 # Fail-fast if anything in the script fails. |
4 set -e | 4 set -e |
5 | 5 |
6 # Remove any existing .android_config file before running android_setup. If we | 6 # Remove any existing .android_config file before running android_setup. If we |
7 # did not remove this now then we would build for whatever device type was | 7 # did not remove this now then we would build for whatever device type was |
8 # listed in the .android_config instead of the default device type. | 8 # listed in the .android_config instead of the default device type. |
9 rm -f .android_config | 9 rm -f .android_config |
10 | 10 |
11 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" | 11 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" |
12 source $SCRIPT_DIR/android_setup.sh | 12 source $SCRIPT_DIR/android_setup.sh |
13 | 13 |
14 if [ $(basename $0) = "android_make" ]; then | 14 GYP_GENERATORS=ninja-android ./gyp_skia |
djsollen
2014/03/31 16:00:34
can we keep this if statement and instead print a
mtklein
2014/03/31 16:04:18
android_ninja is a symlink to android_make. I thi
| |
15 GYP_GENERATORS=make-android make ${APP_ARGS[@]} | 15 OUT=$SKIA_OUT/${BUILDTYPE-Debug} # Defaults to Debug if BUILDTYPE isn't set. |
16 else | 16 ninja -C $OUT ${APP_ARGS[@]} |
17 GYP_GENERATORS=ninja-android ./gyp_skia | 17 ln -sf lib $OUT/lib.target # android_run_skia looks in lib.target; ninja writes to lib. |
18 OUT=$SKIA_OUT/${BUILDTYPE-Debug} # Defaults to Debug if BUILDTYPE isn't se t. | |
19 ninja -C $OUT ${APP_ARGS[@]} | |
20 ln -sf lib $OUT/lib.target # android_run_skia looks in lib.target; n inja writes to lib. | |
21 fi | |
22 | 18 |
23 # Write the device id into the .android_config file. This tells | 19 # Write the device id into the .android_config file. This tells |
24 # android_run_skia the last build we completed. | 20 # android_run_skia the last build we completed. |
25 echo $DEVICE_ID > .android_config | 21 echo $DEVICE_ID > .android_config |
26 | 22 |
OLD | NEW |