Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Unified Diff: platform_tools/android/bin/android_make

Issue 25535002: Fix ninja build on Android (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gyp_skia ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: platform_tools/android/bin/android_make
diff --git a/platform_tools/android/bin/android_make b/platform_tools/android/bin/android_make
index 46512bf8939e937f6979fc4a74581c275a95f09b..a5f5268931010c134cbf19a6fc15888ef2bb41ce 100755
--- a/platform_tools/android/bin/android_make
+++ b/platform_tools/android/bin/android_make
@@ -14,7 +14,7 @@ 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
+ 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.
« no previous file with comments | « gyp_skia ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698