| Index: testing/gtest.gyp
|
| diff --git a/testing/gtest.gyp b/testing/gtest.gyp
|
| index dd9435eab57e82cb654af398456d989f031c111b..fe33db5e1f24d49e4b2ff9b5cf25f2b7011ce8d3 100644
|
| --- a/testing/gtest.gyp
|
| +++ b/testing/gtest.gyp
|
| @@ -106,23 +106,6 @@
|
| ],
|
| },
|
| }],
|
| - ['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" and android_app_abi=="x86"', {
|
| 'defines': [
|
| 'GTEST_HAS_CLONE=0',
|
| @@ -133,25 +116,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': [
|
|
|