Revert "Gyp build support for Chrome OS."

build/common_defines.gypi

@@ -15,14 +15,11 @@
         'angle_build_winphone%': '0',
         'conditions':
         [
-            ['OS=="linux" and use_x11==1',
-            {
+            ['OS=="linux" and use_x11==1 and chromeos==0', {
                 'angle_use_glx%': 1,
-                'angle_use_drm%': 0,
             },
             {
                 'angle_use_glx%': 0,
-                'angle_use_drm%': 1,
             }],
         ],
 
@@ -41,10 +38,6 @@
     ],
     'conditions':
     [
-        ['chromeos==1',
-        {
-            'defines': [ 'USE_OZONE' ],
-        }],
         ['component=="shared_library"',
         {
             'defines': [ 'COMPONENT_BUILD' ],

build/standalone.gypi

@@ -5,22 +5,24 @@
 {
     'variables':
     {
-        # Chrome OS chroot builds need a special pkg-config,
-        # so make it possible to change.
-        'pkg-config%': 'pkg-config',
+        # Assume for the time being that we're never compiling
+        # standalone ANGLE on Chrome OS.
+        'chromeos': 0,
+
+        # Chromium puts the pkg-config command in a variable because
+        # calling pkg-config directly doesn't work in a sysroot image.
+        # See Chromium bug 569947 for more information.
+        # For standalone builds we don't have this problem so we use
+        # the regular command.
+        'pkg-config': 'pkg-config',
 
         # Use a nested variable trick to get use_x11 evaluated more
         # eagerly than other conditional variables.
         'variables':
         {
-            'variables':
-            {
-                'chromeos%': 0,
-            },
-
             'conditions':
             [
-                ['OS=="linux" and chromeos==0',
+                ['OS=="linux"',
                 {
                     'use_x11': 1,
                 },
@@ -28,13 +30,9 @@
                     'use_x11': 0,
                 }],
             ],
-
-            # Copy conditionally-set variables out one scope.
-            'chromeos%': '<(chromeos)',
         },
 
         # Copy conditionally-set variables out one scope.
         'use_x11%': '<(use_x11)',
-        'chromeos%': '<(chromeos)',
     },
 }

src/angle.gyp

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

src/tests/deqp.gypi

@@ -1013,9 +1013,6 @@
                 [
                     '<(deqp_path)/framework/platform/x11',
                 ],
-            }],
-            ['OS=="linux"',
-            {
                 'deqp_defines':
                 [
                     # Ask the system headers to expose all the regular function otherwise
@@ -1376,7 +1373,7 @@
                         {
                             'sources': [ '<@(deqp_libtester_sources_win)', ],
                         }],
-                        ['OS=="linux" or OS=="mac"',
+                        ['(OS=="linux" and use_x11==1) or OS=="mac"',
                         {
                             'sources': [ '<@(deqp_libtester_sources_unix)', ],
                         }],