Make use_system_mesa switch work: make symlinks

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 0abcfa335b1d8e98df836ed92c5a77cfba8b402c..bd0bc61d46e04e5f199ba900d826ced2da26b1fb 100644
--- a/third_party/khronos/khronos.gyp
+++ b/third_party/khronos/khronos.gyp
@@ -3,11 +3,8 @@
 # found in the LICENSE file.
 
 {
-  'variables': {
-    'use_system_khronos%': 0,
-  },
   'conditions': [
-    ['use_system_khronos==0', {
+    ['use_system_mesa==0', {
       'targets': [
         {
           'target_name': 'khronos_headers',
@@ -20,7 +17,7 @@
           },
         },
       ],
-    }, { # use_system_khronos==1
+    }, { # use_system_mesa==1
       'targets': [
         {
           'target_name': 'khronos_headers',
@@ -35,15 +32,52 @@
               '--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',
+              'inputs': [
+              ],
+              'outputs': [
+                '<(khronos_headers_symlink_target)/.dummy_gles2',

[Mark Mentovai, 2013/01/18 17:38:45]

What’s your theory here? You just want to run this ln -s on each and every
build?

[Paweł Hajdan Jr., 2013/01/18 18:36:43]

I can't have empty 'outputs', and the real output is a directory. I'm not sure
what to do with this.

+              ],
+              'action': [
+                'ln', '-s',

[Mark Mentovai, 2013/01/18 17:38:45]

What happens when you run this command more than once (like on a rebuild)?
Something like “ln: File exists”?

[Paweł Hajdan Jr., 2013/01/18 18:36:43]

That could be "solved" with 'ln -sf', but if there is a solution that doesn't
run this on every build unconditionally, that would be great. Is there one, is
there a better way?

+                '<(khronos_headers_symlink_source)/GLES2',
+                '<(khronos_headers_symlink_target)',
+              ],
+              'message': 'Creating GLES2 headers symlinks.',
+            },
+            {
+              'action_name': 'create_khronos_symlinks_khr',
+              'inputs': [
+              ],
+              'outputs': [
+                '<(khronos_headers_symlink_target)/.dummy_khr',
+              ],
+              'action': [
+                'ln', '-s',
+                '<(khronos_headers_symlink_source)/KHR',
+                '<(khronos_headers_symlink_target)',
+              ],
+              'message': 'Creating KHR headers symlinks.',
+            },
+          ],
         },
       ],
     }],