diff options
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/gtest.gyp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/testing/gtest.gyp b/testing/gtest.gyp index 9dfb16f..7c225e8 100644 --- a/testing/gtest.gyp +++ b/testing/gtest.gyp @@ -128,10 +128,15 @@ # own implementation but we must opt in to it. 'defines': [ 'GTEST_USE_OWN_TR1_TUPLE=1', + # GTEST_USE_OWN_TR1_TUPLE only works if GTEST_HAS_TR1_TUPLE is set. + # gtest r625 made it so that GTEST_HAS_TR1_TUPLE is set to 0 + # automatically on android, so it has to be set explicitly here. + 'GTEST_HAS_TR1_TUPLE=1', ], 'direct_dependent_settings': { 'defines': [ 'GTEST_USE_OWN_TR1_TUPLE=1', + 'GTEST_HAS_TR1_TUPLE=1', ], }, }], |