| Index: testing/gtest.gyp
|
| diff --git a/testing/gtest.gyp b/testing/gtest.gyp
|
| index a94ee884fe9f5160469b12b44254baa916ebaf60..cf977688765d98b335695734907089bc23294bda 100644
|
| --- a/testing/gtest.gyp
|
| +++ b/testing/gtest.gyp
|
| @@ -9,77 +9,22 @@
|
| 'toolsets': ['host', 'target'],
|
| 'type': 'static_library',
|
| 'sources': [
|
| + # This file is not really needed by the GYP build, but it is needed by
|
| + # the GN build. See BUILD.gn for details.
|
| + 'gtest/empty.cc',
|
| +
|
| 'gtest/include/gtest/gtest-death-test.h',
|
| 'gtest/include/gtest/gtest-message.h',
|
| 'gtest/include/gtest/gtest-param-test.h',
|
| - 'gtest/include/gtest/gtest-printers.h',
|
| 'gtest/include/gtest/gtest-spi.h',
|
| - 'gtest/include/gtest/gtest-test-part.h',
|
| - 'gtest/include/gtest/gtest-typed-test.h',
|
| 'gtest/include/gtest/gtest.h',
|
| - 'gtest/include/gtest/gtest_pred_impl.h',
|
| - 'gtest/include/gtest/internal/gtest-death-test-internal.h',
|
| - 'gtest/include/gtest/internal/gtest-filepath.h',
|
| - 'gtest/include/gtest/internal/gtest-internal.h',
|
| - 'gtest/include/gtest/internal/gtest-linked_ptr.h',
|
| - 'gtest/include/gtest/internal/gtest-param-util-generated.h',
|
| - 'gtest/include/gtest/internal/gtest-param-util.h',
|
| - 'gtest/include/gtest/internal/gtest-port.h',
|
| - 'gtest/include/gtest/internal/gtest-string.h',
|
| - 'gtest/include/gtest/internal/gtest-tuple.h',
|
| - 'gtest/include/gtest/internal/gtest-type-util.h',
|
| - 'gtest/src/gtest-all.cc',
|
| - 'gtest/src/gtest-death-test.cc',
|
| - 'gtest/src/gtest-filepath.cc',
|
| - 'gtest/src/gtest-internal-inl.h',
|
| - 'gtest/src/gtest-port.cc',
|
| - 'gtest/src/gtest-printers.cc',
|
| - 'gtest/src/gtest-test-part.cc',
|
| - 'gtest/src/gtest-typed-test.cc',
|
| - 'gtest/src/gtest.cc',
|
| + 'gtest/include/gtest/gtest_prod.h',
|
| 'gtest-support.h',
|
| ],
|
| - 'sources!': [
|
| - 'gtest/src/gtest-all.cc', # Not needed by our build.
|
| - ],
|
| - 'include_dirs': [
|
| - 'gtest',
|
| - 'gtest/include',
|
| - ],
|
| 'dependencies': [
|
| - 'gtest_prod',
|
| - ],
|
| - 'defines': [
|
| - # 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',
|
| - 'GTEST_LANG_CXX11=1',
|
| - ],
|
| - 'all_dependent_settings': {
|
| - 'defines': [
|
| - 'GTEST_HAS_POSIX_RE=0',
|
| - 'GTEST_LANG_CXX11=1',
|
| - ],
|
| - },
|
| - 'conditions': [
|
| - ['OS=="android"', {
|
| - 'defines': [
|
| - 'GTEST_HAS_CLONE=0',
|
| - ],
|
| - 'direct_dependent_settings': {
|
| - 'defines': [
|
| - 'GTEST_HAS_CLONE=0',
|
| - ],
|
| - },
|
| - }],
|
| + '../third_party/googletest/googletest.gyp:googletest',
|
| ],
|
| 'direct_dependent_settings': {
|
| - 'defines': [
|
| - 'UNIT_TEST',
|
| - ],
|
| - 'include_dirs': [
|
| - 'gtest/include', # So that gtest headers can find themselves.
|
| - ],
|
| 'target_conditions': [
|
| ['_type=="executable"', {
|
| 'test': 1,
|
| @@ -97,25 +42,21 @@
|
| ],
|
| }],
|
| ],
|
| - 'msvs_disabled_warnings': [4800],
|
| },
|
| },
|
| {
|
| 'target_name': 'gtest_main',
|
| 'type': 'static_library',
|
| 'dependencies': [
|
| - 'gtest',
|
| - ],
|
| - 'sources': [
|
| - 'gtest/src/gtest_main.cc',
|
| + '../third_party/googletest/googletest.gyp:googletest_main',
|
| ],
|
| },
|
| {
|
| 'target_name': 'gtest_prod',
|
| 'toolsets': ['host', 'target'],
|
| 'type': 'none',
|
| - 'sources': [
|
| - 'gtest/include/gtest/gtest_prod.h',
|
| + 'dependencies': [
|
| + '../third_party/googletest/googletest.gyp:googletest_prod',
|
| ],
|
| },
|
| ],
|
|
|