Fix ninja build on Android
R=mtklein@google.com
Review URL: https://codereview.chromium.org/25535002
git-svn-id: http://skia.googlecode.com/svn/trunk@11555 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gyp_skia b/gyp_skia
index 9c31978..b4f9e74 100755
--- a/gyp_skia
+++ b/gyp_skia
@@ -64,7 +64,7 @@
if (sys.platform.startswith('darwin') and
(not os.getenv('GYP_GENERATORS') or
- 'make' not in os.getenv('GYP_GENERATORS'))):
+ 'xcode' in os.getenv('GYP_GENERATORS'))):
print 'ERROR: variable SKIA_OUT is not valid on Mac (using xcodebuild)'
sys.exit(-1);
diff --git a/platform_tools/android/bin/android_make b/platform_tools/android/bin/android_make
index 46512bf..a5f5268 100755
--- a/platform_tools/android/bin/android_make
+++ b/platform_tools/android/bin/android_make
@@ -14,7 +14,7 @@
if [ $(basename $0) = "android_make" ]; then
GYP_GENERATORS=make-android make ${APP_ARGS[@]}
else
- GYP_GENERATORS=ninja ./gyp_skia
+ 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.