diff options
| author | craig.schlenter@chromium.org <craig.schlenter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-29 15:31:37 +0000 |
|---|---|---|
| committer | craig.schlenter@chromium.org <craig.schlenter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-29 15:31:37 +0000 |
| commit | 0d9d30f4805de4037597633f1e0f38a7ace1ef46 (patch) | |
| tree | 2301a7f79e170e86d80933b854121e519942bd5c /views | |
| parent | 8da6475d297e9ebbc49312e16765390cacc295b4 (diff) | |
| download | chromium_src-0d9d30f4805de4037597633f1e0f38a7ace1ef46.zip chromium_src-0d9d30f4805de4037597633f1e0f38a7ace1ef46.tar.gz chromium_src-0d9d30f4805de4037597633f1e0f38a7ace1ef46.tar.bz2 | |
Linux: fix view_examples shared build by adding allocator dependency.
Also clean up tabs and remove unnecessary duplicated dependency.
TEST=compile with gcc 4.4, library=shared_library and toolkit_views=1
BUG=none
Review URL: http://codereview.chromium.org/1519002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42948 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/views.gyp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/views/views.gyp b/views/views.gyp index d6c420d..bde275f 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -153,8 +153,8 @@ 'controls/native/native_view_host_win.cc', 'controls/native/native_view_host_win.h', 'controls/native/native_view_host_wrapper.h', - 'controls/progress_bar.h', - 'controls/progress_bar.cc', + 'controls/progress_bar.h', + 'controls/progress_bar.cc', 'controls/resize_gripper.cc', 'controls/resize_gripper.h', 'controls/scroll_view.cc', @@ -388,13 +388,15 @@ '../build/linux/system.gyp:gtk', '../chrome/chrome.gyp:packed_resources', ], + 'conditions': [ + ['linux_use_tcmalloc==1', { + 'dependencies': [ + '../base/allocator/allocator.gyp:allocator', + ], + }], + ], }, ], - ['OS=="linux" and toolkit_views==1', { - 'dependencies': [ - 'views', - ], - }], ['OS=="win"', { 'link_settings': { 'libraries': [ |