diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-01 15:31:54 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-01 15:31:54 +0000 |
| commit | 3702b2587cb18021d8efdd001ab3c9085f0ac51a (patch) | |
| tree | 5b05e507c72546c5d73faa1fecb8637e92a174aa /platform_tools | |
| parent | 12705329d0807863d4d80cac0f02e543c26f24a1 (diff) | |
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
Diffstat (limited to 'platform_tools')
| -rwxr-xr-x | platform_tools/android/bin/android_make | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform_tools/android/bin/android_make b/platform_tools/android/bin/android_make index 46512bf893..a5f5268931 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. |