diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-31 23:07:49 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-31 23:07:49 +0000 |
| commit | c90e16ce1fbc9abc1a1a58766e0418263ed28a84 (patch) | |
| tree | 21f690c181e40b86dc25cdfcb7d6899c1e08b19e /chrome/chrome.gyp | |
| parent | febf851cbef583f82237843f03313752f645a12d (diff) | |
| download | chromium_src-c90e16ce1fbc9abc1a1a58766e0418263ed28a84.zip chromium_src-c90e16ce1fbc9abc1a1a58766e0418263ed28a84.tar.gz chromium_src-c90e16ce1fbc9abc1a1a58766e0418263ed28a84.tar.bz2 | |
Linux gyp changes
* ipc_tests, startup_tests and page_cycler_tests no depend on 'view'.
* Exclude WebCore/platform/network/ResourceHandle.cpp in favor of
glue/resource_handle_impl.cc.
* Tab cleanup in chrome.gyp.
Review URL: http://codereview.chromium.org/57074
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12915 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 98c24d0..0829259 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -497,8 +497,8 @@ 'browser/cocoa/bookmark_bar_state_controller.mm', 'browser/cocoa/bookmark_menu_bridge.h', 'browser/cocoa/bookmark_menu_bridge.mm', - 'browser/cocoa/bookmark_menu_cocoa_controller.h', - 'browser/cocoa/bookmark_menu_cocoa_controller.mm', + 'browser/cocoa/bookmark_menu_cocoa_controller.h', + 'browser/cocoa/bookmark_menu_cocoa_controller.mm', 'browser/cocoa/browser_test_helper.h', 'browser/cocoa/browser_window_cocoa.h', 'browser/cocoa/browser_window_cocoa.mm', @@ -1370,10 +1370,10 @@ '..', ], 'sources': [ - # 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. + # 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', @@ -1835,7 +1835,7 @@ 'dependencies': [ 'browser', 'common', - 'renderer', + 'renderer', 'test_support_unit', '../base/base.gyp:base', '../testing/gtest.gyp:gtest', @@ -1853,6 +1853,7 @@ 'conditions': [ ['OS=="linux"', { 'dependencies': [ + 'views', '../build/linux/system.gyp:gtk', ], }], @@ -1865,7 +1866,7 @@ 'app', 'browser', 'common', - 'renderer', + 'renderer', 'resources', 'test_support_ui', '../base/base.gyp:base', @@ -2276,7 +2277,7 @@ 'app', 'browser', 'common', - 'renderer', + 'renderer', 'resources', 'test_support_ui', '../base/base.gyp:base', @@ -2292,6 +2293,7 @@ 'conditions': [ ['OS=="linux"', { 'dependencies': [ + 'views', '../build/linux/system.gyp:gtk', ], }], @@ -2368,6 +2370,7 @@ 'dependencies': [ 'resources', 'test_support_ui', + 'views', '../base/base.gyp:base', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', |