diff options
Diffstat (limited to 'testing/gtest.gyp')
| -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', |