summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_browser_extensions.gypi
diff options
context:
space:
mode:
authorkalyan.kondapally@intel.com <kalyan.kondapally@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-19 07:53:43 +0000
committerkalyan.kondapally@intel.com <kalyan.kondapally@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-19 07:53:43 +0000
commit703df8786f157335c40ac407f7f8372d28e67791 (patch)
treee2a7244f0376c88429156a0c09cce328971b849a /chrome/chrome_browser_extensions.gypi
parent1554e827cba484a0221dcf9a8a2302c64e2b225d (diff)
downloadchromium_src-703df8786f157335c40ac407f7f8372d28e67791.zip
chromium_src-703df8786f157335c40ac407f7f8372d28e67791.tar.gz
chromium_src-703df8786f157335c40ac407f7f8372d28e67791.tar.bz2
Hide X11 dependencies when use_x11=0.
When using a non X11 build with Ozone, we still have dependencies on X11. This patch tries to hide X11 and related dependencies when use_x11=0 Review URL: https://codereview.chromium.org/148643002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251981 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser_extensions.gypi')
-rw-r--r--chrome/chrome_browser_extensions.gypi21
1 files changed, 15 insertions, 6 deletions
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index 83a4da4..ab7779a 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -1038,12 +1038,21 @@
'../ui/keyboard/keyboard.gyp:keyboard_resources',
],
}],
- ['OS=="linux" and use_aura==1', {
- 'dependencies': [
- '../build/linux/system.gyp:dbus',
- '../build/linux/system.gyp:fontconfig',
- '../build/linux/system.gyp:x11',
- '../dbus/dbus.gyp:dbus',
+ ['OS=="linux"', {
+ 'conditions': [
+ ['use_aura==1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:dbus',
+ '../build/linux/system.gyp:fontconfig',
+ '../dbus/dbus.gyp:dbus',
+ ],
+ }],
+ # x11 build
+ ['use_x11==1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:x11',
+ ],
+ }],
],
}],
['safe_browsing==1', {