diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-19 16:25:55 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-19 16:25:55 +0000 |
| commit | 27726561964a0cf94fa88fda87cf33cb0cfece54 (patch) | |
| tree | aff0fa3393cb9809cf219d0b055c4a6d91d6bbba /chrome | |
| parent | 84bd9b727cfb823712c0b90105afd25d84b998b1 (diff) | |
| download | chromium_src-27726561964a0cf94fa88fda87cf33cb0cfece54.zip chromium_src-27726561964a0cf94fa88fda87cf33cb0cfece54.tar.gz chromium_src-27726561964a0cf94fa88fda87cf33cb0cfece54.tar.bz2 | |
Only build and depend on views/ on Linux when toolkit_views is set.
http://crbug.com/11066
Review URL: http://codereview.chromium.org/115400
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16382 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome.gyp | 41 |
1 files changed, 33 insertions, 8 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 91500f7..1ff13ed 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1506,6 +1506,11 @@ 'browser/download/download_exe.cc', ], }], + ['OS=="linux" and toolkit_views==0', { + 'sources!': [ + 'browser/bookmarks/bookmark_drop_info.cc', + ], + }], ['OS=="mac"', { 'sources/': [ # Exclude most of download. @@ -1940,7 +1945,6 @@ 'conditions': [ ['OS=="linux"', { 'dependencies': [ - 'views', # Needed for chrome_dll_main.cc #include of gtk/gtk.h '../build/linux/system.gyp:gtk', # Needed for chrome_dll_main.cc use of g_thread_init @@ -1965,6 +1969,11 @@ }, ], }], + ['OS=="linux" and toolkit_views==1', { + 'dependencies': [ + 'views', + ], + }], ['OS=="mac"', { # 'branding' is a variable defined in common.gypi # (e.g. "Chromium", "Chrome") @@ -2464,10 +2473,14 @@ 'conditions': [ ['OS=="linux"', { 'dependencies': [ - 'views', '../build/linux/system.gyp:gtk', ], }], + ['OS=="linux" and toolkit_views==1', { + 'dependencies': [ + 'views', + ], + }], ], }, { @@ -2548,7 +2561,6 @@ 'conditions': [ ['OS=="linux"', { 'dependencies': [ - 'views', '../build/linux/system.gyp:gtk', ], 'sources!': [ @@ -2561,6 +2573,11 @@ 'test/ui/layout_plugin_uitest.cc', ], }], + ['OS=="linux" and toolkit_views==1', { + 'dependencies': [ + 'views', + ], + }], ['OS=="mac"', { 'sources!': [ # TODO(port) @@ -2835,7 +2852,6 @@ 'conditions': [ ['OS=="linux"', { 'dependencies': [ - 'views', '../build/linux/system.gyp:gtk', '../build/linux/system.gyp:nss', ], @@ -2847,6 +2863,11 @@ 'browser/download/download_manager_unittest.cc', ], }], + ['OS=="linux" and toolkit_views==1', { + 'dependencies': [ + 'views', + ], + }], ['OS=="mac"', { # The test fetches resources which means Mac need the app bundle to # exist on disk so it can pull from it. @@ -2949,10 +2970,14 @@ 'conditions': [ ['OS=="linux"', { 'dependencies': [ - 'views', '../build/linux/system.gyp:gtk', ], }], + ['OS=="linux" and toolkit_views==1', { + 'dependencies': [ + 'views', + ], + }], ], }, { @@ -2980,7 +3005,7 @@ '../build/linux/system.gyp:gtk', ], }], - ['OS!="mac"', { + ['OS=="win" or (OS=="linux" and toolkit_views==1)', { 'dependencies': [ 'views', ], @@ -3131,7 +3156,7 @@ 'browser/visitedlink_perftest.cc', ], }], - ['OS!="mac"', { + ['OS=="win" or (OS=="linux" and toolkit_views==1)', { 'dependencies': [ 'views', ], @@ -3140,7 +3165,7 @@ }, ], }], # OS!="mac" - ['OS=="win" or OS=="linux"', + ['OS=="win" or (OS=="linux" and toolkit_views==1)', { 'targets': [ { 'target_name': 'views', |