Index: testing/gtest.gyp |
diff --git a/testing/gtest.gyp b/testing/gtest.gyp |
index d7662101cfea04fe1ba36a50557d37e7ab5b1086..a94ee884fe9f5160469b12b44254baa916ebaf60 100644 |
--- a/testing/gtest.gyp |
+++ b/testing/gtest.gyp |
@@ -53,33 +53,15 @@ |
# In order to allow regex matches in gtest to be shared between Windows |
# and other systems, we tell gtest to always use it's internal engine. |
'GTEST_HAS_POSIX_RE=0', |
- # Chrome doesn't support / require C++11, yet. |
- 'GTEST_LANG_CXX11=0', |
+ 'GTEST_LANG_CXX11=1', |
], |
'all_dependent_settings': { |
'defines': [ |
'GTEST_HAS_POSIX_RE=0', |
- 'GTEST_LANG_CXX11=0', |
+ 'GTEST_LANG_CXX11=1', |
], |
}, |
'conditions': [ |
- ['os_posix == 1', { |
- 'defines': [ |
- # gtest isn't able to figure out when RTTI is disabled for gcc |
- # versions older than 4.3.2, and assumes it's enabled. Our Mac |
- # and Linux builds disable RTTI, and cannot guarantee that the |
- # compiler will be 4.3.2. or newer. The Mac, for example, uses |
- # 4.2.1 as that is the latest available on that platform. gtest |
- # must be instructed that RTTI is disabled here, and for any |
- # direct dependents that might include gtest headers. |
- 'GTEST_HAS_RTTI=0', |
- ], |
- 'direct_dependent_settings': { |
- 'defines': [ |
- 'GTEST_HAS_RTTI=0', |
- ], |
- }, |
- }], |
['OS=="android"', { |
'defines': [ |
'GTEST_HAS_CLONE=0', |
@@ -90,25 +72,6 @@ |
], |
}, |
}], |
- ['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', |
- # 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', |
- ], |
- }, |
- }], |
], |
'direct_dependent_settings': { |
'defines': [ |