diff options
| author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-03 23:13:02 +0000 |
|---|---|---|
| committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-03 23:13:02 +0000 |
| commit | 69c0031bb372b8c13b7a3d08844ef1ef3b57dcd6 (patch) | |
| tree | 0e291397e63b6837a42eab508377679ba7c81d55 /chrome/chrome.gyp | |
| parent | 8e50b600ed1e65789109022709cf5c349748fb4c (diff) | |
| download | chromium_src-69c0031bb372b8c13b7a3d08844ef1ef3b57dcd6.zip chromium_src-69c0031bb372b8c13b7a3d08844ef1ef3b57dcd6.tar.gz chromium_src-69c0031bb372b8c13b7a3d08844ef1ef3b57dcd6.tar.bz2 | |
make uitest and unittest depend on app since the mac gets its resources from the app at runtime.
add history_ui to the build to fix the build break.
Review URL: http://codereview.chromium.org/28332
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10838 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 6e7c88b..fbf1155 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1133,6 +1133,7 @@ ['include', '^browser/dom_ui/dom_ui\\.cc$'], ['include', '^browser/dom_ui/dom_ui_contents\\.cc$'], ['include', '^browser/dom_ui/dom_ui_host\\.cc$'], + ['include', '^browser/dom_ui/history_ui\\.cc$'], ['include', '^browser/dom_ui/new_tab_ui\\.cc$'], # Exclude most of download. @@ -1515,6 +1516,10 @@ 'test/unit/run_all_unittests.cc', ], 'conditions': [ + ['OS=="mac"', { + # mac tests load the resources from the built app beside the test + 'dependencies': ['app'], + }], # There are only real ui_tests on Windows. On other platforms, # there's just a dummy stub that looks like a test. Since it's not # a real ui_tests executable, it builds test/unit/run_all_unittests.cc @@ -1675,6 +1680,10 @@ 'test/unit/run_all_unittests.cc', ], 'conditions': [ + ['OS=="mac"', { + # mac tests load the resources from the built app beside the test + 'dependencies': ['app'], + }], ['OS!="win"', { 'sources!': [ 'browser/autocomplete/autocomplete_unittest.cc', |