Index: platform_tools/android/bin/android_make |
diff --git a/platform_tools/android/bin/android_make b/platform_tools/android/bin/android_make |
index a5f5268931010c134cbf19a6fc15888ef2bb41ce..6966062a9889ac7b801edb43f652f29dc9abf269 100755 |
--- a/platform_tools/android/bin/android_make |
+++ b/platform_tools/android/bin/android_make |
@@ -11,14 +11,10 @@ rm -f .android_config |
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" |
source $SCRIPT_DIR/android_setup.sh |
-if [ $(basename $0) = "android_make" ]; then |
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
|
- GYP_GENERATORS=make-android make ${APP_ARGS[@]} |
-else |
- GYP_GENERATORS=ninja-android ./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 |
+GYP_GENERATORS=ninja-android ./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. |
# Write the device id into the .android_config file. This tells |
# android_run_skia the last build we completed. |