Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Unified Diff: content/content_tests.gypi

Issue 10647008: Fix incremental linking with unit_tests. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/gpu/test_support_gpu.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_tests.gypi
===================================================================
--- content/content_tests.gypi (revision 143598)
+++ content/content_tests.gypi (working copy)
@@ -48,6 +48,7 @@
'public/test/test_renderer_host.h',
'public/test/unittest_test_suite.h',
'public/test/web_contents_tester.h',
+ 'app/startup_helper_win.cc',
# TODO(phajdan.jr): All of those files should live in content/test (if
# they're only used by content) or content/public/test (if they're used
# by other embedders).
@@ -132,6 +133,11 @@
'../webkit/quota/mock_special_storage_policy.h',
],
'conditions': [
+ ['OS == "win" or (toolkit_uses_gtk == 1 and selinux == 0)', {
+ 'dependencies': [
+ '../sandbox/sandbox.gyp:sandbox',
+ ],
+ }],
['enable_webrtc==1', {
'sources': [
'renderer/media/mock_media_stream_dependency_factory.cc',
@@ -220,7 +226,6 @@
'..',
],
'sources': [
- 'app/startup_helper_win.cc',
'browser/accessibility/browser_accessibility_mac_unittest.mm',
'browser/accessibility/browser_accessibility_manager_unittest.cc',
'browser/accessibility/browser_accessibility_win_unittest.cc',
@@ -470,11 +475,6 @@
['exclude', '^browser/renderer_host/gtk_key_bindings_handler_unittest.cc'],
],
}],
- ['OS == "win" or (toolkit_uses_gtk == 1 and selinux == 0)', {
- 'dependencies': [
- '../sandbox/sandbox.gyp:sandbox',
- ],
- }],
['use_aura==1', {
'dependencies': [
'../ui/aura/aura.gyp:aura',
@@ -523,8 +523,6 @@
'HAS_OUT_OF_PROC_TEST_RUNNER',
],
'sources': [
- 'app/startup_helper_win.cc',
- 'public/test/test_launcher.h',
'test/content_browser_test.h',
'test/content_browser_test.cc',
'test/content_test_launcher.cc',
@@ -567,11 +565,6 @@
'../base/allocator/allocator.gyp:allocator',
],
}],
- ['OS == "win" or (toolkit_uses_gtk == 1 and selinux == 0)', {
- 'dependencies': [
- '../sandbox/sandbox.gyp:sandbox',
- ],
- }],
],
},
],
« no previous file with comments | « chrome/test/gpu/test_support_gpu.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698