diff options
| author | jnd@chromium.org <jnd@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-05 10:03:47 +0000 |
|---|---|---|
| committer | jnd@chromium.org <jnd@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-05 10:03:47 +0000 |
| commit | fbf26a0e723f9bf4a6395813dba56eeea570a29b (patch) | |
| tree | c195f7ebf4b5db0174c8d6634d41675e6963d587 /testing | |
| parent | c8a7266a5d9b9c9ff798def26d7f3bedd4b46713 (diff) | |
| download | chromium_src-fbf26a0e723f9bf4a6395813dba56eeea570a29b.zip chromium_src-fbf26a0e723f9bf4a6395813dba56eeea570a29b.tar.gz chromium_src-fbf26a0e723f9bf4a6395813dba56eeea570a29b.tar.bz2 | |
Use gtest's own implementation of tr1::tuple on Android.
Android's libstdc++ doesn't include tr1:: tuple so we must use gtest's instead. This will allow us build gtest/gmock on Android.
BUG=
TEST=
Review URL: http://codereview.chromium.org/7827004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99636 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/gtest.gyp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/testing/gtest.gyp b/testing/gtest.gyp index 2b57742..cecd936 100644 --- a/testing/gtest.gyp +++ b/testing/gtest.gyp @@ -78,10 +78,10 @@ ], }, }], - ['clang==1', { - # We want gtest features that use tr1::tuple, but clang currently - # doesn't support the variadic templates used by libstdc++'s - # implementation. gtest supports this scenario by providing its + ['clang==1 or OS=="android"', { + # We want gtest features that use tr1::tuple, but we currently + # don't support the variadic templates used by libstdc++'s + # implementation. gtest supports this scenario by providing its # own implementation but we must opt in to it. 'defines': [ 'GTEST_USE_OWN_TR1_TUPLE=1', |