Non-SFI Mode: Build gpu/ libraries by PNaCl toolchain for nacl_helper_nonsfi.

gpu/gpu_nacl.gyp

Index: gpu/gpu_nacl.gyp
diff --git a/gpu/gpu_nacl.gyp b/gpu/gpu_nacl.gyp
index 3d8a1c1656a999514e7ff17d90b8a0060503adc5..251df05ff3a34d05c6929d8886260488441dcb57 100644
--- a/gpu/gpu_nacl.gyp
+++ b/gpu/gpu_nacl.gyp
@@ -13,7 +13,7 @@
     'gpu_common.gypi',
   ],
   'conditions': [
-    ['disable_nacl==0 and disable_nacl_untrusted==0', {

[Mark Seaborn, 2014/10/20 15:44:00]

The same simplifications can apply in this file...

[hidehiko, 2014/10/20 19:02:35]

Done.

+    ['disable_nacl==0', {
       'targets': [
         {
           'target_name': 'gles2_implementation_nacl',
@@ -23,7 +23,9 @@
             'nlib_target': 'libgles2_implementation_nacl.a',
             'build_glibc': 0,
             'build_newlib': 0,
-            'build_irt': 1,
+            'build_irt': 0,
+            'build_pnacl_newlib': 0,
+            'build_nonsfi_helper': 1,
           },
           'defines': [
             'GLES2_IMPL_IMPLEMENTATION',
@@ -32,12 +34,22 @@
             '<@(gles2_implementation_source_files)',
           ],
           'dependencies': [
+            '../base/base_nacl.gyp:base_nacl_nonsfi',
             '../native_client/tools.gyp:prep_toolchain',
-            '../base/base_nacl.gyp:base_nacl',
             '../third_party/khronos/khronos.gyp:khronos_headers',
             'command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl',
             'gles2_cmd_helper_nacl',
           ],
+          'conditions': [
+            ['disable_nacl_untrusted==0', {
+              'variables': {
+                'build_irt': 1,
+              },
+              'dependencies': [
+                '../base/base_nacl.gyp:base_nacl',
+              ],
+            }],
+          ],
         },
         {
           'target_name': 'command_buffer_common_nacl',
@@ -47,16 +59,28 @@
             'nlib_target': 'libcommand_buffer_common_nacl.a',
             'build_glibc': 0,
             'build_newlib': 0,
-            'build_irt': 1,
+            'build_irt': 0,
+            'build_pnacl_newlib': 0,
+            'build_nonsfi_helper': 1,
           },
           'includes': [
             'command_buffer_common.gypi',
           ],
           'dependencies': [
+            '../base/base_nacl.gyp:base_nacl_nonsfi',
             '../native_client/tools.gyp:prep_toolchain',
-            '../base/base_nacl.gyp:base_nacl',
             'command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl',
           ],
+          'conditions': [
+            ['disable_nacl_untrusted==0', {
+              'variables': {
+                'build_irt': 1,
+              },
+              'dependencies': [
+                '../base/base_nacl.gyp:base_nacl',
+              ],
+            }],
+          ],
         },
         {
           'target_name': 'gles2_cmd_helper_nacl',
@@ -66,16 +90,28 @@
             'nlib_target': 'libgles2_cmd_helper_nacl.a',
             'build_glibc': 0,
             'build_newlib': 0,
-            'build_irt': 1,
+            'build_irt': 0,
+            'build_pnacl_newlib': 0,
+            'build_nonsfi_helper': 1,
           },
           'includes': [
             'gles2_cmd_helper.gypi',
           ],
           'dependencies': [
+            '../base/base_nacl.gyp:base_nacl_nonsfi',
             '../native_client/tools.gyp:prep_toolchain',
-            '../base/base_nacl.gyp:base_nacl',
             'command_buffer_client_nacl',
           ],
+          'conditions': [
+            ['disable_nacl_untrusted==0', {
+              'variables': {
+                'build_irt': 1,
+              },
+              'dependencies': [
+                '../base/base_nacl.gyp:base_nacl',
+              ],
+            }],
+          ],
         },
         {
           'target_name': 'command_buffer_client_nacl',
@@ -85,16 +121,28 @@
             'nlib_target': 'libcommand_buffer_client_nacl.a',
             'build_glibc': 0,
             'build_newlib': 0,
-            'build_irt': 1,
+            'build_irt': 0,
+            'build_pnacl_newlib': 0,
+            'build_nonsfi_helper': 1,
           },
           'includes': [
             'command_buffer_client.gypi',
           ],
           'dependencies': [
+            '../base/base_nacl.gyp:base_nacl_nonsfi',
             '../native_client/tools.gyp:prep_toolchain',
-            '../base/base_nacl.gyp:base_nacl',
             'command_buffer_common_nacl',
           ],
+          'conditions': [
+            ['disable_nacl_untrusted==0', {
+              'variables': {
+                'build_irt': 1,
+              },
+              'dependencies': [
+                '../base/base_nacl.gyp:base_nacl',
+              ],
+            }],
+          ],
         },
         {
           'target_name': 'gpu_ipc_nacl',
@@ -104,16 +152,28 @@
             'nlib_target': 'libgpu_ipc_nacl.a',
             'build_glibc': 0,
             'build_newlib': 0,
-            'build_irt': 1,
+            'build_irt': 0,
+            'build_pnacl_newlib': 0,
+            'build_nonsfi_helper': 1,
           },
           'includes': [
             'gpu_ipc.gypi',
           ],
           'dependencies': [
+            '../base/base_nacl.gyp:base_nacl_nonsfi',
             '../native_client/tools.gyp:prep_toolchain',
-            '../base/base_nacl.gyp:base_nacl',
             'command_buffer_common_nacl',
           ],
+          'conditions': [
+            ['disable_nacl_untrusted==0', {
+              'variables': {
+                'build_irt': 1,
+              },
+              'dependencies': [
+                '../base/base_nacl.gyp:base_nacl',
+              ],
+            }],
+          ],
         },
       ],
     }],