Non-SFI Mode: Build shared_memory_support_nacl library for nacl_helper_nonsfi.

media/media_nacl.gyp

Index: media/media_nacl.gyp
diff --git a/media/media_nacl.gyp b/media/media_nacl.gyp
index 2dd4bf9863e741d300f6a2f43f214f22c49a2d8d..781c528002d1c1e19874f13b8c4c7121fe09e6dc 100644
--- a/media/media_nacl.gyp
+++ b/media/media_nacl.gyp
@@ -10,7 +10,7 @@
     '../native_client/build/untrusted.gypi',
   ],
   'conditions': [
-    ['disable_nacl==0 and disable_nacl_untrusted==0', {
+    ['disable_nacl==0', {
       'targets': [
         {
           'target_name': 'shared_memory_support_nacl',
@@ -20,11 +20,13 @@
             'nlib_target': 'libshared_memory_support_nacl.a',
             'build_glibc': 0,
             'build_newlib': 0,
-            'build_irt': 1,
+            'build_irt': 0,
+            'build_pnacl_newlib': 0,
+            'build_nonsfi_helper': 1,
           },
           'dependencies': [
             '../native_client/tools.gyp:prep_toolchain',
-            '../base/base_nacl.gyp:base_nacl',
+            '../base/base_nacl.gyp:base_nacl_nonsfi',
           ],
           'defines': [
             'MEDIA_IMPLEMENTATION',
@@ -38,7 +40,21 @@
           'sources': [
             '<@(shared_memory_support_sources)',
           ],
+          'conditions': [
+            ['disable_nacl_untrusted==0', {

[Junichi Uekawa, 2014/10/17 10:24:21]

the meat of change seems to be enabling nonsfi_helper even when
disable_nacl_untrusted = 1, is that really intentional ?

[hidehiko, 2014/10/20 06:28:18]

Yes. We'll build nacl_helper_nonsfi regardless of disable_nacl_untrusted.

+              'variables': {
+                'build_irt': 1,
+              },
+              'dependencies': [
+                '../base/base_nacl.gyp:base_nacl',
+              ],
+            }],
+          ],
         },  # end of target 'shared_memory_support_nacl'
+      ],
+    }],
+    ['disable_nacl==0 and disable_nacl_untrusted==0', {
+      'targets': [
         {
           'target_name': 'media_yuv_nacl',
           'type': 'none',