Build only the appropriate x86 arches for nacl (chrome side).

ppapi/ppapi_nacl.gyp

 # Copyright 2014 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.
 
 # This GYP file defines untrusted (NaCl) targets.  All targets in this
 # file should be conditionally depended upon via 'disable_nacl!=1' to avoid
 # requiring NaCl sources for building.
 
 {
   'includes': [
-    '../native_client/build/untrusted.gypi',
+    '../build/common_untrusted.gypi',
     'ppapi_sources.gypi',
   ],
   'targets': [
     {
       'target_name': 'ppapi_cpp_lib',
       'type': 'none',
       'variables': {
         'nlib_target': 'libppapi_cpp.a',
         'nso_target': 'libppapi_cpp.so',
         'build_glibc': 1,
@@ skipping 71 matching lines @@
           '-lppapi',
           '-pthread',
         ],
         'link_flags!': [
           '-O3',
         ],
         'translate_flags': [
           '-O0',
         ],
         'conditions': [
-          ['target_arch=="ia32" or target_arch=="x64"', {
-            'extra_deps_newlib64': [
-              '>(tc_lib_dir_newlib64)/libppapi_cpp.a',
-              '>(tc_lib_dir_newlib64)/libppapi.a',
-            ],
+          ['target_arch=="ia32"', {
             'extra_deps_newlib32': [
               '>(tc_lib_dir_newlib32)/libppapi_cpp.a',
               '>(tc_lib_dir_newlib32)/libppapi.a',
             ],
-            'extra_deps_glibc64': [
-              '>(tc_lib_dir_glibc64)/libppapi_cpp.so',
-              '>(tc_lib_dir_glibc64)/libppapi.so',
-            ],
             'extra_deps_glibc32': [
               '>(tc_lib_dir_glibc32)/libppapi_cpp.so',
               '>(tc_lib_dir_glibc32)/libppapi.so',
             ],
           }],
+          ['target_arch=="x64" or (target_arch=="ia32" and OS=="win")', {
+            'extra_deps_newlib64': [
+              '>(tc_lib_dir_newlib64)/libppapi_cpp.a',
+              '>(tc_lib_dir_newlib64)/libppapi.a',
+            ],
+            'extra_deps_glibc64': [
+              '>(tc_lib_dir_glibc64)/libppapi_cpp.so',
+              '>(tc_lib_dir_glibc64)/libppapi.so',
+            ],
+          }],
           ['target_arch=="arm"', {
             'extra_deps_arm': [
               '>(tc_lib_dir_newlib_arm)/libppapi_cpp.a',
               '>(tc_lib_dir_newlib_arm)/libppapi.a',
             ],
           }],
         ],
         'extra_deps_pnacl_newlib': [
           '>(tc_lib_dir_pnacl_newlib)/libppapi_cpp.a',
           '>(tc_lib_dir_pnacl_newlib)/libppapi.a',
         ],
         'sources': [
           '<@(test_common_source_files)',
           '<@(test_nacl_source_files)',
         ],
         'extra_args': [
           '--strip-all',
         ],
         'create_nmf': '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py',
         'create_nonsfi_test_nmf': 'tests/create_nonsfi_test_nmf.py',
       },
       'conditions': [
-        ['target_arch!="arm" and target_arch!="mipsel" and disable_glibc==0', {
+        ['(target_arch=="ia32" or target_arch=="x64") and disable_glibc==0', {
           'variables': {
             'build_glibc': 1,
             # NOTE: Use /lib, not /lib64 here; it is a symbolic link which
             # doesn't work on Windows.
             'libdir_glibc64': '>(nacl_glibc_tc_root)/x86_64-nacl/lib',
             'libdir_glibc32': '>(nacl_glibc_tc_root)/x86_64-nacl/lib32',
             'nacl_objdump': '>(nacl_glibc_tc_root)/bin/x86_64-nacl-objdump',
             'nmf_glibc%': '<(PRODUCT_DIR)/>(nexe_target)_glibc.nmf',
           },
           'actions': [
           {
             'action_name': 'Generate GLIBC NMF and copy libs',
             # NOTE: create_nmf must be first, it is the script python executes
             # below.
-            'inputs': ['>(create_nmf)', '>(out_glibc64)', '>(out_glibc32)'],
+            'inputs': ['>(create_nmf)'],
             # NOTE: There is no explicit dependency for the lib32
             # and lib64 directories created in the PRODUCT_DIR.
             # They are created as a side-effect of NMF creation.
             'outputs': ['>(nmf_glibc)'],
             'action': [
               'python',
               '>@(_inputs)',
               '--objdump=>(nacl_objdump)',
-              '--library-path=>(libdir_glibc64)',
-              '--library-path=>(libdir_glibc32)',
-              '--library-path=>(tc_lib_dir_glibc32)',
-              '--library-path=>(tc_lib_dir_glibc64)',
               '--output=>(nmf_glibc)',
               '--stage-dependencies=<(PRODUCT_DIR)',
             ],
+            'conditions': [
+              ['target_arch=="ia32"', {
+                'action': [
+                  '--library-path=>(libdir_glibc32)',
+                  '--library-path=>(tc_lib_dir_glibc32)',
+                ],
+                'inputs': ['>(out_glibc32)'],
+              }],
+              ['target_arch=="x64" or (target_arch=="ia32" and OS=="win")', {
+                'action': [
+                  '--library-path=>(libdir_glibc64)',
+                  '--library-path=>(tc_lib_dir_glibc64)',
+                ],
+                'inputs': ['>(out_glibc64)'],
+              }],
+            ],
           },
         ],
         }],
         # Test PNaCl pre-translated code (pre-translated to save bot time).
         # We only care about testing that code generation is correct,
         # and in-browser translation is tested elsewhere.
         # NOTE: native_client/build/untrusted.gypi dictates that
         # PNaCl only generate x86-32 and x86-64 on x86 platforms,
         # ARM on ARM platforms, or MIPS on MIPS platforms, not all
         # versions always.
         # The same goes for the PNaCl shims. So, we have two variations here.
         ['disable_pnacl==0 and (target_arch=="ia32" or target_arch=="x64")', {
           'variables': {
             'build_pnacl_newlib': 1,
             'translate_pexe_with_build': 1,
             'nmf_pnacl%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl.nmf',
           },
           # Shim is a dependency for the nexe because we pre-translate.
           'dependencies': [
             '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
           ],
           'actions': [
             {
               'action_name': 'Generate PNACL NEWLIB NMF',
               # NOTE: create_nmf must be first, it is the script python executes
               # below.
               'inputs': [
                 '>(create_nmf)',
-                '>(out_pnacl_newlib_x86_32_nexe)',
-                '>(out_pnacl_newlib_x86_64_nexe)'
               ],
               'outputs': ['>(nmf_pnacl)'],
               'action': [
                 'python',
                 '>@(_inputs)',
                 '--output=>(nmf_pnacl)',
               ],
+              'conditions': [
+                ['target_arch=="ia32"', {
+                  'inputs': [
+                    '>(out_pnacl_newlib_x86_32_nexe)',
+                  ],
+                }],
+                ['target_arch=="x64" or (target_arch=="ia32" and OS=="win")', {
+                  'inputs': [
+                    '>(out_pnacl_newlib_x86_64_nexe)',
+                  ],
+                }],
+              ],
             },
           ],
         }],
         ['disable_pnacl==0 and target_arch=="ia32" and OS=="linux"', {
           # In addition to above configuration, build x86-32-nonsfi .nexe file
           # by translating from .pexe binary, for non-SFI mode PPAPI testing.
           'variables': {
             'enable_x86_32_nonsfi': 1,
             'translate_pexe_with_build': 1,
             'nmf_nonsfi%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_nonsfi.nmf',
@@ skipping 61 matching lines @@
                 '>@(_inputs)',
                 '--output=>(nmf_pnacl)',
               ],
             },
           ],
         }],
       ],
     },
   ],
 }