Non-SFI Mode: Build shared_memory_support_nacl library for nacl_helper_nonsfi.

media/media_nacl.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     '../native_client/build/untrusted.gypi',
   ],
   'conditions': [
-    ['disable_nacl==0 and disable_nacl_untrusted==0', {
+    ['disable_nacl==0', {
       'targets': [
         {
           'target_name': 'shared_memory_support_nacl',
           'type': 'none',
           'variables': {
             'nacl_untrusted_build': 1,
             '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',
           ],
           'include_dirs': [
             '..',
           ],
           'includes': [
             'shared_memory_support.gypi',
           ],
           'sources': [
             '<@(shared_memory_support_sources)',
           ],
+          'conditions': [

[Mark Seaborn, 2014/10/20 15:47:06]

My comments from https://codereview.chromium.org/649183005/ apply here too. 
This pattern is complicated and I don't think it's good to be copying this into
every target that gets built for the IRT.

[hidehiko, 2014/10/20 19:01:52]

Done.

+            ['disable_nacl_untrusted==0', {
+              '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',
           'variables': {
             'nlib_target': 'libmedia_yuv_nacl.a',
             'build_glibc': 0,
             'build_newlib': 0,
             'build_pnacl_newlib': 1,
           },
           'dependencies': [
@@ skipping 12 matching lines @@
             'base/simd/yuv_to_rgb_table.cc',
             'base/simd/yuv_to_rgb_table.h',
             'base/yuv_convert.cc',
             'base/yuv_convert.h',
           ],
         },  # end of target 'media_yuv_nacl'
       ],
     }],
   ],
 }