diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-05 02:17:49 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-05 02:17:49 +0000 |
| commit | c71fc77963db75fc518483dc38a1b4498499cb6f (patch) | |
| tree | 2a521b4da36ceb110a7433ac3a710fd4050c3f80 | |
| parent | 3ec656606fba81d634acf0dca14eb78b7e691902 (diff) | |
| download | chromium_src-c71fc77963db75fc518483dc38a1b4498499cb6f.zip chromium_src-c71fc77963db75fc518483dc38a1b4498499cb6f.tar.gz chromium_src-c71fc77963db75fc518483dc38a1b4498499cb6f.tar.bz2 | |
Fixed aura dependencies to not include gtk but bring in
necessary X libraries
BUG=97131
TEST=None
Review URL: http://codereview.chromium.org/8118027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104050 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/chrome_main.cc | 5 | ||||
| -rw-r--r-- | chrome/chrome_browser.gypi | 7 | ||||
| -rw-r--r-- | chrome/chrome_exe.gypi | 32 |
3 files changed, 34 insertions, 10 deletions
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc index a24e1b3..4d26172 100644 --- a/chrome/app/chrome_main.cc +++ b/chrome/app/chrome_main.cc @@ -79,10 +79,13 @@ #include "chrome/browser/chromeos/boot_times_loader.h" #endif -#if defined(USE_X11) +#if defined(TOOLKIT_USES_GTK) #include <gdk/gdk.h> #include <glib.h> #include <gtk/gtk.h> +#endif + +#if defined(USE_X11) #include <stdlib.h> #include <string.h> #include "ui/base/x/x11_util.h" diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index e7ae7ec..636171a 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -4141,6 +4141,13 @@ ['exclude', '^browser/ui/webui/keyboard_ui.*'], ], }], + ['OS=="linux"', { + 'link_settings': { + 'libraries': [ + '-lXss', + ], + }, + }], ['OS=="linux" and use_aura==1', { 'dependencies': [ '../build/linux/system.gyp:dbus', diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index 219fadb..6f0bfe33 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -122,15 +122,29 @@ }, ], }], - ], - 'dependencies': [ - # On Linux, link the dependencies (libraries) that make up actual - # Chromium functionality directly into the executable. - '<@(chromium_dependencies)', - # Needed for chrome_main.cc initialization of libraries. - '../build/linux/system.gyp:gtk', - # Needed to use the master_preferences functions - 'installer_util', + ['toolkit_uses_gtk == 1', { + 'dependencies': [ + # On Linux, link the dependencies (libraries) that make up actual + # Chromium functionality directly into the executable. + '<@(chromium_dependencies)', + # Needed for chrome_main.cc initialization of libraries. + '../build/linux/system.gyp:gtk', + # Needed to use the master_preferences functions + 'installer_util', + ], + }, { # else toolkit_uses_gtk == 1 + 'dependencies': [ + # On Linux, link the dependencies (libraries) that make up actual + # Chromium functionality directly into the executable. + '<@(chromium_dependencies)', + # Needed for chrome_main.cc initialization of libraries. + '../build/linux/system.gyp:x11', + '../build/linux/system.gyp:pangocairo', + '../build/linux/system.gyp:xext', + # Needed to use the master_preferences functions + 'installer_util', + ], + }], ], 'sources': [ 'app/chrome_dll_resource.h', |