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

chrome/chrome_browser.gypi

@@ -3450,7 +3450,6 @@
               'dependencies': [
                 '../build/linux/system.gyp:dbus',
                 '../build/linux/system.gyp:fontconfig',
-                '../build/linux/system.gyp:x11',
                 '../dbus/dbus.gyp:dbus',
               ],
               'sources/': [
@@ -3463,6 +3462,12 @@
                 ['exclude', '^browser/lifetime/application_lifetime_stub.cc'],
               ],
             }],
+            # x11 build
+            ['use_x11==1', {
+              'dependencies': [
+                '../build/linux/system.gyp:x11',
+              ],
+            }],
           ],
         }],
         ['enable_plugin_installation==0', {

chrome/chrome_browser_extensions.gypi

@@ -1038,14 +1038,23 @@
             '../ui/keyboard/keyboard.gyp:keyboard_resources',
           ],
         }],
-        ['OS=="linux" and use_aura==1', {
+        ['OS=="linux"', {
+          'conditions': [
+            ['use_aura==1', {
               'dependencies': [
                 '../build/linux/system.gyp:dbus',
                 '../build/linux/system.gyp:fontconfig',
-            '../build/linux/system.gyp:x11',
                 '../dbus/dbus.gyp:dbus',
               ],
             }],
+            # x11 build
+            ['use_x11==1', {
+              'dependencies': [
+                '../build/linux/system.gyp:x11',
+              ],
+            }],
+          ],
+        }],
         ['safe_browsing==1', {
           'defines': [
             'FULL_SAFE_BROWSING',

chrome/chrome_browser_ui.gypi

@@ -3326,7 +3326,6 @@
               'dependencies': [
                 '../build/linux/system.gyp:dbus',
                 '../build/linux/system.gyp:fontconfig',
-                '../build/linux/system.gyp:x11',
                 '../dbus/dbus.gyp:dbus',
               ],
             }],
@@ -3337,6 +3336,12 @@
                 ['exclude', '^browser/ui/views/notifications/balloon_collection_views.cc'],
               ],
             }],
+            # x11 build
+            ['use_x11==1', {
+              'dependencies': [
+                '../build/linux/system.gyp:x11',
+              ],
+            }],
           ],
         }],
         # On chromeos, file manager extension handles the file open/save dialog.

chrome/chrome_exe.gypi

@@ -201,13 +201,18 @@
                 '<@(chromium_child_dependencies)',
                 '../content/content.gyp:content_app_both',
                 # 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',
               ],
             }],
+            # x11 build. Needed for chrome_main.cc initialization of libraries.
+            ['use_x11==1', {
+              'dependencies': [
+                '../build/linux/system.gyp:x11',
+                '../build/linux/system.gyp:xext',
+              ],
+            }],
           ],
           'sources': [
             'app/chrome_dll_resource.h',

gpu/tools/tools.gyp

@@ -9,7 +9,7 @@
   'targets': [
   ],
   'conditions': [
-    ['OS == "linux" and target_arch != "arm"', {
+    ['OS == "linux" and target_arch != "arm" and use_x11==1', {
       'targets': [
         {
           'target_name': 'compositor_model_bench',

media/cast/cast.gyp

@@ -184,7 +184,7 @@
             '<(DEPTH)/media/cast/test/receiver.cc',
           ],
           'conditions': [
-            ['OS == "linux"', {
+            ['OS == "linux" and use_x11==1', {
               'dependencies': [
                 '<(DEPTH)/build/linux/system.gyp:x11',
                 '<(DEPTH)/build/linux/system.gyp:xext',

tools/android/forwarder2/forwarder.gyp

@@ -62,7 +62,6 @@
       'toolsets': ['host'],
       'dependencies': [
         '../../../base/base.gyp:base',
-        '../../../build/linux/system.gyp:x11',
         '../common/common.gyp:android_tools_common',
       ],
       'include_dirs': [
@@ -78,8 +77,8 @@
         'host_forwarder_main.cc',
         'pipe_notifier.cc',
         'socket.cc',
-        # TODO(pliard): Remove this and x11 dependency above. This is needed
-        # to avoid undefined references at link time.
+        # TODO(pliard): Remove this. This is needed to avoid undefined
+        # references at link time.
         '../../../base/message_loop/message_pump_glib.cc',
         '../../../base/message_loop/message_pump_gtk.cc',
       ],