Switching IRT to be built inside the chrome build.

chrome/nacl.gypi

 # Copyright (c) 2011 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.
 
 {
   'target_defaults': {
     'variables': {
       'nacl_target': 0,
     },
     'target_conditions': [
@@ skipping 61 matching lines @@
         '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel',
         '../native_client/src/trusted/platform_qualify/platform_qualify.gyp:platform_qual_lib',
       ],
       'direct_dependent_settings': {
         'defines': [
           'NACL_BLOCK_SHIFT=5',
           'NACL_BLOCK_SIZE=32',
           '<@(nacl_defines)',
         ],
       },
-      'conditions': [
-        ['target_arch=="ia32"', {
-           'copies': [
-             {
-               'destination': '<(PRODUCT_DIR)',
-               'files': [
-                 '../native_client/irt_binaries/nacl_irt_x86_32.nexe',
-               ],
-             },
-           ],
-        }],
-        ['target_arch=="x64" or OS=="win"', {
-           'copies': [
-             {
-               'destination': '<(PRODUCT_DIR)',
-               'files': [
-                 '../native_client/irt_binaries/nacl_irt_x86_64.nexe',
-               ],
-             },
-           ],
-        }],
+      'actions': [
+        {
+          'action_name': 'nacl_irt',
+          'message': 'Building NaCl IRT',
+          'action': [
+            'python', 'build_nacl_irt.py',
+            '--outdir', '<(PRODUCT_DIR)',
+          ],
+          'inputs': [
+            '<!@(python build_nacl_irt.py --inputs --platform=x86-32 --platform=x86-64)',
+          ],
+          'conditions': [
+            ['target_arch=="ia32"', {
+              'outputs': [
+                '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
+              ],
+              'action': [

[noelallen_use_chromium, 2011/08/18 19:11:16]

I've never seen the case of appending to an action?

+                '--platform', 'x86-32',
+              ],
+            }],
+            ['target_arch=="x64" or OS=="win"', {
+              'outputs': [
+                '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
+              ],
+              'action': [
+                '--platform', 'x86-64',
+              ],
+            }],
+          ],
+        },
       ],
     },
   ],
   'conditions': [
     ['OS=="win"', {
       'targets': [
         {
           'target_name': 'nacl_win64',
           'type': 'static_library',
           'variables': {
@@ skipping 81 matching lines @@
                         # reference nacl_helper as a shared library
                         '<(PRODUCT_DIR)/nacl_helper.so',
                         '-Wl,-rpath,<(SHARED_LIB_DIR)',
                       ],
           },
         },
       ],
     }],
   ],
 }