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 /testing | |
| 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 'testing')
| -rw-r--r-- | testing/iossim/iossim.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testing/iossim/iossim.gyp b/testing/iossim/iossim.gyp index 6a1fb02..0fdd8b1 100644 --- a/testing/iossim/iossim.gyp +++ b/testing/iossim/iossim.gyp @@ -4,7 +4,7 @@ { 'conditions': [ - ['OS!="ios" or "<(GENERATOR)"=="ninja"', { + ['OS!="ios" or "<(GENERATOR)"!="xcode" or "<(GENERATOR_FLAVOR)"=="ninja"', { 'targets': [ { 'target_name': 'iossim', @@ -126,7 +126,7 @@ }, }, ], - }, { # else, OS=="ios" and "<(GENERATOR)"!="ninja" + }, { # else, OS=="ios" and "<(GENERATOR)"=="xcode" and "<(GENERATOR_FLAVOR)"!="ninja" 'variables': { 'ninja_output_dir': 'ninja-iossim', 'ninja_product_dir': |