Index: third_party/crashpad/crashpad/third_party/gtest/gtest.gyp |
diff --git a/third_party/crashpad/crashpad/third_party/gtest/gtest.gyp b/third_party/crashpad/crashpad/third_party/gtest/gtest.gyp |
index e01adaf5f6c388209ab562acfb17a15f76360b02..ad458936fa0df4bcd17ab090a2ba616ebf8d929d 100644 |
--- a/third_party/crashpad/crashpad/third_party/gtest/gtest.gyp |
+++ b/third_party/crashpad/crashpad/third_party/gtest/gtest.gyp |
@@ -17,274 +17,252 @@ |
'../../build/crashpad_dependencies.gypi', |
], |
'conditions': [ |
- ['crashpad_dependencies!="chromium"', { |
+ ['1==1', { # Defer processing until crashpad_dependencies is set |
'variables': { |
'conditions': [ |
['crashpad_dependencies=="standalone"', { |
'gtest_dir': 'gtest/googletest', |
- }, { |
+ }], |
+ ['crashpad_dependencies=="external"', { |
'gtest_dir': '../../../../gtest', |
}], |
], |
}, |
- 'target_defaults': { |
- # gtest relies heavily on objects with static storage duration. |
- 'xcode_settings': { |
- 'WARNING_CFLAGS!': [ |
- '-Wexit-time-destructors', |
- ], |
- }, |
- 'cflags!': [ |
- '-Wexit-time-destructors', |
+ }], |
+ ], |
+ 'target_defaults': { |
+ # gtest relies heavily on objects with static storage duration. |
+ 'xcode_settings': { |
+ 'WARNING_CFLAGS!': [ |
+ '-Wexit-time-destructors', |
+ ], |
+ }, |
+ 'cflags!': [ |
+ '-Wexit-time-destructors', |
+ ], |
+ }, |
+ |
+ 'targets': [ |
+ { |
+ 'target_name': 'gtest', |
+ 'type': 'static_library', |
+ 'include_dirs': [ |
+ '<(gtest_dir)', |
+ '<(gtest_dir)/include', |
+ ], |
+ 'sources': [ |
+ '<(gtest_dir)/include/gtest/gtest-death-test.h', |
+ '<(gtest_dir)/include/gtest/gtest-message.h', |
+ '<(gtest_dir)/include/gtest/gtest-param-test.h', |
+ '<(gtest_dir)/include/gtest/gtest-printers.h', |
+ '<(gtest_dir)/include/gtest/gtest-spi.h', |
+ '<(gtest_dir)/include/gtest/gtest-test-part.h', |
+ '<(gtest_dir)/include/gtest/gtest-typed-test.h', |
+ '<(gtest_dir)/include/gtest/gtest.h', |
+ '<(gtest_dir)/include/gtest/gtest_pred_impl.h', |
+ '<(gtest_dir)/include/gtest/gtest_prod.h', |
+ '<(gtest_dir)/include/gtest/internal/custom/gtest-port.h', |
+ '<(gtest_dir)/include/gtest/internal/custom/gtest-printers.h', |
+ '<(gtest_dir)/include/gtest/internal/custom/gtest.h', |
+ '<(gtest_dir)/include/gtest/internal/gtest-death-test-internal.h', |
+ '<(gtest_dir)/include/gtest/internal/gtest-filepath.h', |
+ '<(gtest_dir)/include/gtest/internal/gtest-internal.h', |
+ '<(gtest_dir)/include/gtest/internal/gtest-linked_ptr.h', |
+ '<(gtest_dir)/include/gtest/internal/gtest-param-util-generated.h', |
+ '<(gtest_dir)/include/gtest/internal/gtest-param-util.h', |
+ '<(gtest_dir)/include/gtest/internal/gtest-port-arch.h', |
+ '<(gtest_dir)/include/gtest/internal/gtest-port.h', |
+ '<(gtest_dir)/include/gtest/internal/gtest-string.h', |
+ '<(gtest_dir)/include/gtest/internal/gtest-tuple.h', |
+ '<(gtest_dir)/include/gtest/internal/gtest-type-util.h', |
+ '<(gtest_dir)/src/gtest-all.cc', |
+ '<(gtest_dir)/src/gtest-death-test.cc', |
+ '<(gtest_dir)/src/gtest-filepath.cc', |
+ '<(gtest_dir)/src/gtest-internal-inl.h', |
+ '<(gtest_dir)/src/gtest-port.cc', |
+ '<(gtest_dir)/src/gtest-printers.cc', |
+ '<(gtest_dir)/src/gtest-test-part.cc', |
+ '<(gtest_dir)/src/gtest-typed-test.cc', |
+ '<(gtest_dir)/src/gtest.cc', |
+ ], |
+ 'sources!': [ |
+ '<(gtest_dir)/src/gtest-all.cc', |
+ ], |
+ 'direct_dependent_settings': { |
+ 'include_dirs': [ |
+ '<(gtest_dir)/include', |
], |
}, |
- |
- 'targets': [ |
- { |
- 'target_name': 'gtest', |
- 'type': 'static_library', |
+ 'conditions': [ |
+ ['crashpad_dependencies=="external"', { |
'include_dirs': [ |
- '<(gtest_dir)', |
- '<(gtest_dir)/include', |
- ], |
- 'sources': [ |
- '<(gtest_dir)/include/gtest/gtest-death-test.h', |
- '<(gtest_dir)/include/gtest/gtest-message.h', |
- '<(gtest_dir)/include/gtest/gtest-param-test.h', |
- '<(gtest_dir)/include/gtest/gtest-printers.h', |
- '<(gtest_dir)/include/gtest/gtest-spi.h', |
- '<(gtest_dir)/include/gtest/gtest-test-part.h', |
- '<(gtest_dir)/include/gtest/gtest-typed-test.h', |
- '<(gtest_dir)/include/gtest/gtest.h', |
- '<(gtest_dir)/include/gtest/gtest_pred_impl.h', |
- '<(gtest_dir)/include/gtest/gtest_prod.h', |
- '<(gtest_dir)/include/gtest/internal/custom/gtest-port.h', |
- '<(gtest_dir)/include/gtest/internal/custom/gtest-printers.h', |
- '<(gtest_dir)/include/gtest/internal/custom/gtest.h', |
- '<(gtest_dir)/include/gtest/internal/gtest-death-test-internal.h', |
- '<(gtest_dir)/include/gtest/internal/gtest-filepath.h', |
- '<(gtest_dir)/include/gtest/internal/gtest-internal.h', |
- '<(gtest_dir)/include/gtest/internal/gtest-linked_ptr.h', |
- '<(gtest_dir)/include/gtest/internal/gtest-param-util-generated.h', |
- '<(gtest_dir)/include/gtest/internal/gtest-param-util.h', |
- '<(gtest_dir)/include/gtest/internal/gtest-port-arch.h', |
- '<(gtest_dir)/include/gtest/internal/gtest-port.h', |
- '<(gtest_dir)/include/gtest/internal/gtest-string.h', |
- '<(gtest_dir)/include/gtest/internal/gtest-tuple.h', |
- '<(gtest_dir)/include/gtest/internal/gtest-type-util.h', |
- '<(gtest_dir)/src/gtest-all.cc', |
- '<(gtest_dir)/src/gtest-death-test.cc', |
- '<(gtest_dir)/src/gtest-filepath.cc', |
- '<(gtest_dir)/src/gtest-internal-inl.h', |
- '<(gtest_dir)/src/gtest-port.cc', |
- '<(gtest_dir)/src/gtest-printers.cc', |
- '<(gtest_dir)/src/gtest-test-part.cc', |
- '<(gtest_dir)/src/gtest-typed-test.cc', |
- '<(gtest_dir)/src/gtest.cc', |
+ '<(gtest_dir)/../..', |
], |
- 'sources!': [ |
- '<(gtest_dir)/src/gtest-all.cc', |
+ 'defines': [ |
+ 'GUNIT_NO_GOOGLE3=1', |
], |
'direct_dependent_settings': { |
'include_dirs': [ |
- '<(gtest_dir)/include', |
+ '<(gtest_dir)/../..', |
], |
- }, |
- 'conditions': [ |
- ['crashpad_dependencies=="external"', { |
- 'include_dirs': [ |
- '<(gtest_dir)/../..', |
- ], |
- 'defines': [ |
- 'GUNIT_NO_GOOGLE3=1', |
- ], |
- 'direct_dependent_settings': { |
- 'include_dirs': [ |
- '<(gtest_dir)/../..', |
- ], |
- 'defines': [ |
- 'GUNIT_NO_GOOGLE3=1', |
- ], |
- }, |
- }], |
- ], |
- }, |
- { |
- 'target_name': 'gtest_main', |
- 'type': 'static_library', |
- 'dependencies': [ |
- 'gtest', |
- ], |
- 'sources': [ |
- '<(gtest_dir)/src/gtest_main.cc', |
- ], |
- }, |
- { |
- 'target_name': 'gtest_test_executable', |
- 'type': 'none', |
- 'dependencies': [ |
- 'gtest', |
- ], |
- 'direct_dependent_settings': { |
- 'type': 'executable', |
- 'include_dirs': [ |
- '<(gtest_dir)', |
+ 'defines': [ |
+ 'GUNIT_NO_GOOGLE3=1', |
], |
}, |
- 'export_dependent_settings': [ |
- 'gtest', |
- ], |
- }, |
- { |
- 'target_name': 'gtest_all_test', |
- 'dependencies': [ |
- 'gtest_test_executable', |
- 'gtest_main', |
- ], |
- 'sources': [ |
- '<(gtest_dir)/test/gtest-death-test_test.cc', |
- '<(gtest_dir)/test/gtest-filepath_test.cc', |
- '<(gtest_dir)/test/gtest-linked_ptr_test.cc', |
- '<(gtest_dir)/test/gtest-message_test.cc', |
- '<(gtest_dir)/test/gtest-options_test.cc', |
- '<(gtest_dir)/test/gtest-port_test.cc', |
- '<(gtest_dir)/test/gtest-printers_test.cc', |
- '<(gtest_dir)/test/gtest-test-part_test.cc', |
- '<(gtest_dir)/test/gtest-typed-test2_test.cc', |
- '<(gtest_dir)/test/gtest-typed-test_test.cc', |
- '<(gtest_dir)/test/gtest-typed-test_test.h', |
- '<(gtest_dir)/test/gtest_main_unittest.cc', |
- '<(gtest_dir)/test/gtest_pred_impl_unittest.cc', |
- '<(gtest_dir)/test/gtest_prod_test.cc', |
- '<(gtest_dir)/test/gtest_unittest.cc', |
- '<(gtest_dir)/test/production.cc', |
- '<(gtest_dir)/test/production.h', |
- ], |
- }, |
- { |
- 'target_name': 'gtest_environment_test', |
- 'dependencies': [ |
- 'gtest_test_executable', |
- ], |
- 'sources': [ |
- '<(gtest_dir)/test/gtest_environment_test.cc', |
- ], |
- }, |
- { |
- 'target_name': 'gtest_listener_test', |
- 'dependencies': [ |
- 'gtest_test_executable', |
- ], |
- 'sources': [ |
- '<(gtest_dir)/test/gtest-listener_test.cc', |
- ], |
- }, |
- { |
- 'target_name': 'gtest_no_test', |
- 'dependencies': [ |
- 'gtest_test_executable', |
- ], |
- 'sources': [ |
- '<(gtest_dir)/test/gtest_no_test_unittest.cc', |
- ], |
- }, |
- { |
- 'target_name': 'gtest_param_test', |
- 'dependencies': [ |
- 'gtest_test_executable', |
- ], |
- 'sources': [ |
- '<(gtest_dir)/test/gtest-param-test2_test.cc', |
- '<(gtest_dir)/test/gtest-param-test_test.cc', |
- '<(gtest_dir)/test/gtest-param-test_test.h', |
- ], |
- }, |
- { |
- 'target_name': 'gtest_premature_exit_test', |
- 'dependencies': [ |
- 'gtest_test_executable', |
- ], |
- 'sources': [ |
- '<(gtest_dir)/test/gtest_premature_exit_test.cc', |
- ], |
- }, |
- { |
- 'target_name': 'gtest_repeat_test', |
- 'dependencies': [ |
- 'gtest_test_executable', |
- ], |
- 'sources': [ |
- '<(gtest_dir)/test/gtest_repeat_test.cc', |
- ], |
- }, |
- { |
- 'target_name': 'gtest_sole_header_test', |
- 'dependencies': [ |
- 'gtest_test_executable', |
- 'gtest_main', |
- ], |
- 'sources': [ |
- '<(gtest_dir)/test/gtest_sole_header_test.cc', |
- ], |
- }, |
- { |
- 'target_name': 'gtest_stress_test', |
- 'dependencies': [ |
- 'gtest_test_executable', |
- ], |
- 'sources': [ |
- '<(gtest_dir)/test/gtest_stress_test.cc', |
- ], |
- }, |
- { |
- 'target_name': 'gtest_unittest_api_test', |
- 'dependencies': [ |
- 'gtest_test_executable', |
- ], |
- 'sources': [ |
- '<(gtest_dir)/test/gtest-unittest-api_test.cc', |
- ], |
- }, |
- { |
- 'target_name': 'gtest_all_tests', |
- 'type': 'none', |
- 'dependencies': [ |
- 'gtest_all_test', |
- 'gtest_environment_test', |
- 'gtest_listener_test', |
- 'gtest_no_test', |
- 'gtest_param_test', |
- 'gtest_premature_exit_test', |
- 'gtest_repeat_test', |
- 'gtest_sole_header_test', |
- 'gtest_stress_test', |
- 'gtest_unittest_api_test', |
- ], |
- }, |
+ }], |
], |
- }, { # else: crashpad_dependencies=="chromium" |
- 'targets': [ |
- { |
- 'target_name': 'gtest', |
- 'type': 'none', |
- 'dependencies': [ |
- '<(DEPTH)/testing/gtest.gyp:gtest', |
- ], |
- 'export_dependent_settings': [ |
- '<(DEPTH)/testing/gtest.gyp:gtest', |
- ], |
- }, |
- { |
- 'target_name': 'gtest_main', |
- 'type': 'none', |
- 'dependencies': [ |
- '<(DEPTH)/testing/gtest.gyp:gtest_main', |
- ], |
- 'export_dependent_settings': [ |
- '<(DEPTH)/testing/gtest.gyp:gtest_main', |
- ], |
- }, |
+ }, |
+ { |
+ 'target_name': 'gtest_main', |
+ 'type': 'static_library', |
+ 'dependencies': [ |
+ 'gtest', |
], |
- }], |
+ 'sources': [ |
+ '<(gtest_dir)/src/gtest_main.cc', |
+ ], |
+ }, |
+ { |
+ 'target_name': 'gtest_test_executable', |
+ 'type': 'none', |
+ 'dependencies': [ |
+ 'gtest', |
+ ], |
+ 'direct_dependent_settings': { |
+ 'type': 'executable', |
+ 'include_dirs': [ |
+ '<(gtest_dir)', |
+ ], |
+ }, |
+ 'export_dependent_settings': [ |
+ 'gtest', |
+ ], |
+ }, |
+ { |
+ 'target_name': 'gtest_all_test', |
+ 'dependencies': [ |
+ 'gtest_test_executable', |
+ 'gtest_main', |
+ ], |
+ 'sources': [ |
+ '<(gtest_dir)/test/gtest-death-test_test.cc', |
+ '<(gtest_dir)/test/gtest-filepath_test.cc', |
+ '<(gtest_dir)/test/gtest-linked_ptr_test.cc', |
+ '<(gtest_dir)/test/gtest-message_test.cc', |
+ '<(gtest_dir)/test/gtest-options_test.cc', |
+ '<(gtest_dir)/test/gtest-port_test.cc', |
+ '<(gtest_dir)/test/gtest-printers_test.cc', |
+ '<(gtest_dir)/test/gtest-test-part_test.cc', |
+ '<(gtest_dir)/test/gtest-typed-test2_test.cc', |
+ '<(gtest_dir)/test/gtest-typed-test_test.cc', |
+ '<(gtest_dir)/test/gtest-typed-test_test.h', |
+ '<(gtest_dir)/test/gtest_main_unittest.cc', |
+ '<(gtest_dir)/test/gtest_pred_impl_unittest.cc', |
+ '<(gtest_dir)/test/gtest_prod_test.cc', |
+ '<(gtest_dir)/test/gtest_unittest.cc', |
+ '<(gtest_dir)/test/production.cc', |
+ '<(gtest_dir)/test/production.h', |
+ ], |
+ }, |
+ { |
+ 'target_name': 'gtest_environment_test', |
+ 'dependencies': [ |
+ 'gtest_test_executable', |
+ ], |
+ 'sources': [ |
+ '<(gtest_dir)/test/gtest_environment_test.cc', |
+ ], |
+ }, |
+ { |
+ 'target_name': 'gtest_listener_test', |
+ 'dependencies': [ |
+ 'gtest_test_executable', |
+ ], |
+ 'sources': [ |
+ '<(gtest_dir)/test/gtest-listener_test.cc', |
+ ], |
+ }, |
+ { |
+ 'target_name': 'gtest_no_test', |
+ 'dependencies': [ |
+ 'gtest_test_executable', |
+ ], |
+ 'sources': [ |
+ '<(gtest_dir)/test/gtest_no_test_unittest.cc', |
+ ], |
+ }, |
+ { |
+ 'target_name': 'gtest_param_test', |
+ 'dependencies': [ |
+ 'gtest_test_executable', |
+ ], |
+ 'sources': [ |
+ '<(gtest_dir)/test/gtest-param-test2_test.cc', |
+ '<(gtest_dir)/test/gtest-param-test_test.cc', |
+ '<(gtest_dir)/test/gtest-param-test_test.h', |
+ ], |
+ }, |
+ { |
+ 'target_name': 'gtest_premature_exit_test', |
+ 'dependencies': [ |
+ 'gtest_test_executable', |
+ ], |
+ 'sources': [ |
+ '<(gtest_dir)/test/gtest_premature_exit_test.cc', |
+ ], |
+ }, |
+ { |
+ 'target_name': 'gtest_repeat_test', |
+ 'dependencies': [ |
+ 'gtest_test_executable', |
+ ], |
+ 'sources': [ |
+ '<(gtest_dir)/test/gtest_repeat_test.cc', |
+ ], |
+ }, |
+ { |
+ 'target_name': 'gtest_sole_header_test', |
+ 'dependencies': [ |
+ 'gtest_test_executable', |
+ 'gtest_main', |
+ ], |
+ 'sources': [ |
+ '<(gtest_dir)/test/gtest_sole_header_test.cc', |
+ ], |
+ }, |
+ { |
+ 'target_name': 'gtest_stress_test', |
+ 'dependencies': [ |
+ 'gtest_test_executable', |
+ ], |
+ 'sources': [ |
+ '<(gtest_dir)/test/gtest_stress_test.cc', |
+ ], |
+ }, |
+ { |
+ 'target_name': 'gtest_unittest_api_test', |
+ 'dependencies': [ |
+ 'gtest_test_executable', |
+ ], |
+ 'sources': [ |
+ '<(gtest_dir)/test/gtest-unittest-api_test.cc', |
+ ], |
+ }, |
+ { |
+ 'target_name': 'gtest_all_tests', |
+ 'type': 'none', |
+ 'dependencies': [ |
+ 'gtest_all_test', |
+ 'gtest_environment_test', |
+ 'gtest_listener_test', |
+ 'gtest_no_test', |
+ 'gtest_param_test', |
+ 'gtest_premature_exit_test', |
+ 'gtest_repeat_test', |
+ 'gtest_sole_header_test', |
+ 'gtest_stress_test', |
+ 'gtest_unittest_api_test', |
+ ], |
+ }, |
], |
} |