Fix ANGLE build on Chrome OS ARM.

build/common.gypi

@@ -32,24 +32,6 @@
             '-Wwrite-strings',
             '-Wno-format-nonliteral',
         ],
-
-        # Nested dictionnary hack to allow setting a default value for
-        # a variable and test it in the dict (merged in angle.gyp).
-        'variables':
-        {
-            'conditions':
-            [
-                ['OS=="linux"',
-                {
-                    'use_x11': 1,
-                },
-                {
-                    'use_x11': 0,
-                }],
-            ],
-        },
-        # Copy conditionally-set variables out one scope.
-        'use_x11%': '<(use_x11)',
     },
     'target_defaults':
     {

build/common_defines.gypi

@@ -10,6 +10,15 @@
         'angle_build_winrt%': '0',
         'angle_build_winphone%': '0',
         'angle_build_winrt_app_type_revision%': '8.1',
+        'conditions':
+        [
+            ['OS=="linux" and use_x11==1 and chromeos==0', {
+                'angle_use_glx%': 1,
+            },
+            {
+                'angle_use_glx%': 0,
+            }],
+        ],
     },
     'msvs_disabled_warnings':
     [

build/gyp_angle

@@ -26,6 +26,10 @@ if __name__ == '__main__':
     # correct directory. This only has an effect on Linux.
     args.append('--depth');
     args.append('.');
+    # Add standalone.gypi to the include path to set required
+    # variables that are otherwise picked up from Chromium's gyp
+    # files.
+    args.append('-I' + os.path.join(script_dir, 'standalone.gypi'))
     # Add common.gypi to the include path.
     args.append('-I' + os.path.join(script_dir, 'common.gypi'))
     args.append('--no-parallel')

build/standalone.gypi

+# Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+    'variables':
+    {
+        # Assume for the time being that we're never compiling
+        # standalone ANGLE on Chrome OS.
+        'chromeos': 0,
+
+        # Use a nested variable trick to get use_x11 evaluated more
+        # eagerly than other conditional variables.
+        'variables':
+        {
+            'conditions':
+            [
+                ['OS=="linux"',
+                {
+                    'use_x11': 1,
+                },
+                {
+                    'use_x11': 0,
+                }],
+            ],
+        },
+
+        # Copy conditionally-set variables out one scope.
+        'use_x11%': '<(use_x11)',
+    },
+}

src/angle.gyp

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

src/libGLESv2.gypi

@@ -561,7 +561,7 @@
                         ],
                         'conditions':
                         [
-                            ['use_x11==1',
+                            ['angle_use_glx==1',
                             {
                                 'defines':
                                 [
@@ -679,7 +679,7 @@
                                 '<@(libangle_gl_wgl_sources)',
                             ],
                         }],
-                        ['use_x11==1',
+                        ['angle_use_glx==1',
                         {
                             'defines':
                             [
@@ -771,7 +771,7 @@
                 {
                     'msvs_enable_winphone' : '1',
                 }],
-                ['use_x11==1',
+                ['angle_use_glx==1',
                 {
                     'link_settings': {
                         'ldflags': [