| Index: testing/gtest.gyp
|
| diff --git a/testing/gtest.gyp b/testing/gtest.gyp
|
| index 2b57742e961d0e7528080dccbe79375821b8658f..cecd93698d1e45f25e9ac2df2dcbcd2fc5d6d0ea 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',
|
|
|