summaryrefslogtreecommitdiffstats
path: root/testing/gtest.gyp
diff options
context:
space:
mode:
authorlliabraa@chromium.org <lliabraa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-20 16:28:12 +0000
committerlliabraa@chromium.org <lliabraa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-20 16:28:12 +0000
commit57871bcfc48f1fff1e2375231ea30a5d0cddb8d6 (patch)
treeb1736fb37beda5bc5a70d37332424a126f37952b /testing/gtest.gyp
parent5e93fa16b1a7b9d7be01d4573eb0ce63ac481347 (diff)
downloadchromium_src-57871bcfc48f1fff1e2375231ea30a5d0cddb8d6.zip
chromium_src-57871bcfc48f1fff1e2375231ea30a5d0cddb8d6.tar.gz
chromium_src-57871bcfc48f1fff1e2375231ea30a5d0cddb8d6.tar.bz2
Update iossim.gyp to use src/build/ios/mac_build.gypi.
The mac_build.gypi will build the iossim executable using ninja. BUG=None Review URL: https://chromiumcodereview.appspot.com/10827200 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152335 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing/gtest.gyp')
-rw-r--r--testing/gtest.gyp3
1 files changed, 3 insertions, 0 deletions
diff --git a/testing/gtest.gyp b/testing/gtest.gyp
index 5c5ae8a..4fa71dd 100644
--- a/testing/gtest.gyp
+++ b/testing/gtest.gyp
@@ -64,6 +64,9 @@
},
}],
['OS == "ios"', {
+ 'dependencies' : [
+ '<(DEPTH)/testing/iossim/iossim.gyp:iossim',
+ ],
'direct_dependent_settings': {
'target_conditions': [
# Turn all tests into bundles on iOS because that's the only