diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-31 19:39:17 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-31 19:39:17 +0000 |
| commit | 652dbec4721b66e9f44d9bdde92449901eadd106 (patch) | |
| tree | 765f274a828022b3d5ed131d49e1e114bf706764 | |
| parent | 667191e7e360049a2bb14edb1b51da47aa5e0f9a (diff) | |
| download | chromium_src-652dbec4721b66e9f44d9bdde92449901eadd106.zip chromium_src-652dbec4721b66e9f44d9bdde92449901eadd106.tar.gz chromium_src-652dbec4721b66e9f44d9bdde92449901eadd106.tar.bz2 | |
Fixed Mac link problems with ipc_tests ui_tests startup_tests
Review URL: http://codereview.chromium.org/56119
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12892 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/chrome.gyp | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 13a7655..98c24d0 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1358,6 +1358,7 @@ 'dependencies': [ 'common', 'resources', + '../printing/printing.gyp:printing', '../skia/skia.gyp:skia', '../third_party/icu38/icu38.gyp:icui18n', '../third_party/icu38/icu38.gyp:icuuc', @@ -1369,7 +1370,14 @@ '..', ], 'sources': [ - # All .cc, .h, and .mm files under renderer except tests and mocks. + # TODO(jrg): to link ipc_tests, these files need to be in renderer.a. + # But app/ is the wrong directory for them. + # Better is to remove the dep of *_tests on renderer, but in the + # short term I'd like the build to work. + 'app/breakpad_win.cc', + 'app/breakpad_win.h', + 'app/breakpad_mac.mm', + 'app/breakpad_mac.h', 'renderer/automation/dom_automation_controller.cc', 'renderer/automation/dom_automation_controller.h', 'renderer/extensions/extension_process_bindings.cc', @@ -1480,10 +1488,6 @@ ], 'sources': [ # All .cc, .h, .m, and .mm files under app except for tests. - 'app/breakpad_win.cc', - 'app/breakpad_win.h', - 'app/breakpad_mac.mm', - 'app/breakpad_mac.h', 'app/chrome_dll_main.cc', 'app/chrome_dll_resource.h', 'app/chrome_exe_main.cc', @@ -1829,7 +1833,9 @@ 'target_name': 'ipc_tests', 'type': 'executable', 'dependencies': [ + 'browser', 'common', + 'renderer', 'test_support_unit', '../base/base.gyp:base', '../testing/gtest.gyp:gtest', @@ -1859,6 +1865,7 @@ 'app', 'browser', 'common', + 'renderer', 'resources', 'test_support_ui', '../base/base.gyp:base', @@ -2269,6 +2276,7 @@ 'app', 'browser', 'common', + 'renderer', 'resources', 'test_support_ui', '../base/base.gyp:base', |