Chromium Code Reviews| Index: testing/gtest.gyp |
| diff --git a/testing/gtest.gyp b/testing/gtest.gyp |
| index 2b57742e961d0e7528080dccbe79375821b8658f..93c2f51865df559a0aa982042a26210a40850e47 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 |
| + ['clang==1 or OS=="android"', { |
| + # We want gtest features that use tr1::tuple, but we currently |
| # doesn't support the variadic templates used by libstdc++'s |
|
Peter Beverloo
2011/09/01 12:34:08
doesn't -> don't
|
| - # implementation. gtest supports this scenario by providing its |
| + # implementation. gtest supports this scenario by providing its |
| # own implementation but we must opt in to it. |
| 'defines': [ |
| 'GTEST_USE_OWN_TR1_TUPLE=1', |