Index: testing/gtest.gyp |
diff --git a/testing/gtest.gyp b/testing/gtest.gyp |
index f4577df8d23b5025d1ece31405f79a3ac9307b4e..671a508675d49c669ce75bc945ac8989e1cf4504 100644 |
--- a/testing/gtest.gyp |
+++ b/testing/gtest.gyp |
@@ -3,46 +3,16 @@ |
# found in the LICENSE file. |
{ |
+ 'includes': [ |
+ 'gtest.gypi', |
+ ], |
'targets': [ |
{ |
'target_name': 'gtest', |
'toolsets': ['host', 'target'], |
'type': 'static_library', |
'sources': [ |
- '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', |
- 'multiprocess_func_list.cc', |
- 'multiprocess_func_list.h', |
- 'platform_test.h', |
- ], |
- 'sources!': [ |
- 'gtest/src/gtest-all.cc', # Not needed by our build. |
+ '<@(gtest_sources)', |
], |
'include_dirs': [ |
'gtest', |