diff options
| author | Paweł Hajdan, Jr <phajdan.jr@chromium.org> | 2014-10-29 17:29:05 +0100 |
|---|---|---|
| committer | Paweł Hajdan, Jr <phajdan.jr@chromium.org> | 2014-10-29 16:29:55 +0000 |
| commit | ee13e422ce3d941a5f78567ab828984b32163c3b (patch) | |
| tree | e1152675826a57d0855bd9ae415b593a578d2b00 /testing/gmock.gyp | |
| parent | 50caac1f197cb020dc986eae379dfd245ffb9d94 (diff) | |
| download | chromium_src-ee13e422ce3d941a5f78567ab828984b32163c3b.zip chromium_src-ee13e422ce3d941a5f78567ab828984b32163c3b.tar.gz chromium_src-ee13e422ce3d941a5f78567ab828984b32163c3b.tar.bz2 | |
Check in executable for iOS test launcher (attempt #2)
This is a reland of https://codereview.chromium.org/669673004 after fixes.
This doesn't do anything yet, mostly adds supporting infrastructure.
R=lliabraa@chromium.org, mark@chromium.org
TBR=darin
BUG=426870
Review URL: https://codereview.chromium.org/688663003
Cr-Commit-Position: refs/heads/master@{#301850}
Diffstat (limited to 'testing/gmock.gyp')
| -rw-r--r-- | testing/gmock.gyp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/testing/gmock.gyp b/testing/gmock.gyp index 22a1893..6363b4b 100644 --- a/testing/gmock.gyp +++ b/testing/gmock.gyp @@ -47,6 +47,11 @@ 'export_dependent_settings': [ 'gtest.gyp:gtest', ], + 'conditions': [ + ['OS == "ios"', { + 'toolsets': ['host', 'target'], + }], + ], }, { 'target_name': 'gmock_main', |