Linux: remove use_system_mesa bits.

third_party/khronos/khronos.gyp

Index: third_party/khronos/khronos.gyp
diff --git a/third_party/khronos/khronos.gyp b/third_party/khronos/khronos.gyp
index bac7eb81f936c898a4a4f572bd3b609000a1a6ca..8a855728d52823ed8be854261f90841c14b773e3 100644
--- a/third_party/khronos/khronos.gyp
+++ b/third_party/khronos/khronos.gyp
@@ -3,95 +3,16 @@
 # found in the LICENSE file.
 
 {
-  'conditions': [
-    ['use_system_mesa==0', {
-      'targets': [
-        {
-          'target_name': 'khronos_headers',
-          'type': 'none',
-          'all_dependent_settings': {
-            'include_dirs': [
-              '.',
-              '../../gpu',  # Contains GLES2/gl2chromium.h
-            ],
-          },
-        },
-      ],
-    }, { # use_system_mesa==1
-      'targets': [
-        {
-          'target_name': 'khronos_headers',
-          'type': 'none',
-          'variables': {
-            'headers_root_path': '../..',
-            'header_filenames': [
-              'GLES2/gl2.h;<GLES2/gl2chromium.h>;',
-              'GLES2/gl2ext.h;<GLES2/gl2chromium.h>;<GLES2/gl2extchromium.h>',
-            ],
-            'shim_generator_additional_args': [
-              '--headers-root', '.',
-              '--use-include-next',
-            ],
-            'khronos_headers_symlink_source%': '/usr/include',
-            'khronos_headers_symlink_target': '<(SHARED_INTERMEDIATE_DIR)/khronos_symlinks',
-          },
-          'includes': [
-            '../../build/shim_headers.gypi',
-          ],
-          'all_dependent_settings': {
-            'include_dirs': [
-              '<(khronos_headers_symlink_target)',
-              '../../gpu',  # Contains GLES2/gl2chromium.h
-            ],
-          },
-          'actions': [
-            # Symlink system headers into include paths so that nacl
-            # untrusted build can use them. Adding system include paths
-            # to nacl untrusted build include path would break the build,
-            # so we only add needed parts.
-            {
-              'action_name': 'create_khronos_symlinks_gles2',
-              'variables': {
-                'dummy_file':  '<(khronos_headers_symlink_target)/.dummy_gles2',
-              },
-              'inputs': [
-                'khronos.gyp',
-              ],
-              'outputs': [
-                '<(dummy_file)',
-              ],
-              'action': [
-                '../../build/symlink.py',
-                '--force',
-                '--touch', '<(dummy_file)',
-                '<(khronos_headers_symlink_source)/GLES2',
-                '<(khronos_headers_symlink_target)',
-              ],
-              'message': 'Creating GLES2 headers symlinks.',
-            },
-            {
-              'action_name': 'create_khronos_symlinks_khr',
-              'variables': {
-                'dummy_file':  '<(khronos_headers_symlink_target)/.dummy_khr',
-              },
-              'inputs': [
-                'khronos.gyp',
-              ],
-              'outputs': [
-                '<(dummy_file)',
-              ],
-              'action': [
-                '../../build/symlink.py',
-                '--force',
-                '--touch', '<(dummy_file)',
-                '<(khronos_headers_symlink_source)/KHR',
-                '<(khronos_headers_symlink_target)',
-              ],
-              'message': 'Creating KHR headers symlinks.',
-            },
-          ],
-        },
-      ],
-    }],
+  'targets': [
+    {
+      'target_name': 'khronos_headers',
+      'type': 'none',
+      'all_dependent_settings': {
+        'include_dirs': [
+          '.',
+          '../../gpu',  # Contains GLES2/gl2chromium.h
+        ],
+      },
+    },
   ],
 }