Don't enable opengl on linux unless x11 is also available.

build/common.gypi

@@ -32,6 +32,17 @@
             '-Wwrite-strings',
             '-Wno-format-nonliteral',
         ],
+
+        'conditions':
+        [
+            ['OS=="linux"',
+            {
+                'use_x11%': 1,
+            },
+            {
+                'use_x11%': 0,
+            }],
+        ],
     },
     'target_defaults':
     {

build/common_defines.gypi

@@ -10,14 +10,6 @@
         'angle_build_winrt%': '0',
         'angle_build_winphone%': '0',
         'angle_build_winrt_app_type_revision%': '8.1',
-        'use_x11%': 0,
-        'conditions':
-        [
-            ['OS=="linux"',
-            {
-                'use_x11%': 1,
-            }],
-        ],
     },
     'msvs_disabled_warnings':
     [
@@ -29,7 +21,7 @@
 
         # TODO: 4702 doesn't fire on xtree in VS2015 (CTP6). We can remove C4702 after moving to VS2015.
         4702, # Unreachable code. Should only fire on system header xtree.
-        
+
         4718, # Recursive call has no side effects. Fires on xtree too.
     ],
     'conditions':

src/angle.gyp

@@ -26,7 +26,7 @@
                 'angle_enable_d3d11%': 1,
                 'angle_enable_hlsl%': 1,
             }],
-            ['OS=="linux"',
+            ['OS=="linux" and use_x11==1',
             {
                 'angle_enable_gl%': 1,
             }],

src/libGLESv2.gypi

@@ -550,13 +550,16 @@
                         [
                             'ANGLE_ENABLE_OPENGL',
                         ],
-                    }],
-                    ['use_x11==1',
-                    {
-                        'defines':
+                        'conditions':
                         [
-                            'ANGLE_USE_X11',
-                        ]
+                            ['use_x11==1',
+                            {
+                                'defines':
+                                [
+                                    'ANGLE_USE_X11',
+                                ]
+                            }],
+                        ],
                     }],
                 ],
             },
@@ -669,6 +672,10 @@
                         }],
                         ['use_x11==1',
                         {
+                            'defines':
+                            [
+                                'ANGLE_USE_X11',
+                            ],
                             'sources':
                             [
                                 '<@(libangle_gl_glx_sources)',
@@ -676,13 +683,6 @@
                         }],
                     ],
                 }],
-                ['use_x11==1',
-                {
-                    'defines':
-                    [
-                        'ANGLE_USE_X11',
-                    ]
-                }],
                 ['angle_build_winrt==0 and OS=="win"',
                 {
                     'dependencies':

util/util.gyp

@@ -99,11 +99,14 @@
                     [
                         '<@(util_x11_sources)',
                     ],
-                    'link_settings': {
-                        'ldflags': [
+                    'link_settings':
+                    {
+                        'ldflags':
+                        [
                             '<!@(pkg-config --libs-only-L --libs-only-other x11 xi)',
                         ],
-                        'libraries': [
+                        'libraries':
+                        [
                             '<!@(pkg-config --libs-only-l x11 xi) -lrt',
                         ],
                     },