diff options
| author | sdefresne <sdefresne@chromium.org> | 2015-03-18 07:16:17 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-18 14:17:29 +0000 |
| commit | a3b0391e1ccfa025fe6fcf0e1c5749dc3a8ba1b4 (patch) | |
| tree | eaad62abacb3df5828d7b5a490253f0d5c9abd33 /breakpad/breakpad.gyp | |
| parent | cfe4bca70096f5aaf4cd97b6fb8711cbe57798b1 (diff) | |
| download | chromium_src-a3b0391e1ccfa025fe6fcf0e1c5749dc3a8ba1b4.zip chromium_src-a3b0391e1ccfa025fe6fcf0e1c5749dc3a8ba1b4.tar.gz chromium_src-a3b0391e1ccfa025fe6fcf0e1c5749dc3a8ba1b4.tar.bz2 | |
Treat "xcode-ninja" generator the same as "ninja" generator
When generator is "xcode-ninja" there is no need to do the recursive
reinvocation of gyp to work-around Xcode not supporting iOS targets
to depend on Mac tools.
BUG=467575
Review URL: https://codereview.chromium.org/1013753002
Cr-Commit-Position: refs/heads/master@{#321124}
Diffstat (limited to 'breakpad/breakpad.gyp')
| -rw-r--r-- | breakpad/breakpad.gyp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp index 2e2e709..9c503df 100644 --- a/breakpad/breakpad.gyp +++ b/breakpad/breakpad.gyp @@ -10,7 +10,7 @@ 'conditions': [ # minidump_stackwalk and minidump_dump are tool-type executables that do # not build on iOS with Xcode (but do build on iOS with ninja.) - ['(OS!="ios" or "<(GENERATOR)"!="xcode") and OS!="win"', { + ['(OS!="ios" or "<(GENERATOR)"!="xcode" or "<(GENERATOR_FLAVOR)"=="ninja") and OS!="win"', { 'targets': [ { # code shared by both {micro,mini}dump_stackwalk @@ -164,7 +164,7 @@ }, ], }], - ['OS=="mac" or (OS=="ios" and "<(GENERATOR)"!="xcode")', { + ['OS=="mac" or (OS=="ios" and ("<(GENERATOR)"!="xcode" or "<(GENERATOR_FLAVOR)"=="ninja"))', { 'target_defaults': { 'include_dirs': [ 'src', @@ -851,7 +851,7 @@ } ] }], - ['OS=="ios" and "<(GENERATOR)"=="xcode"', { + ['OS=="ios" and "<(GENERATOR)"=="xcode" and "<(GENERATOR_FLAVOR)"!="ninja"', { 'variables': { 'ninja_output_dir': 'ninja-breakpad', 'ninja_product_dir': |