Revert 97943 - Switching NaCl 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 41 matching lines @@
         ],
       }],
     ],
   },
   'targets': [
     {
       'target_name': 'nacl',
       'type': 'static_library',
       'variables': {
         'nacl_target': 1,
-        'irt_build_cmd': [
-          'python', 'build_nacl_irt.py', '--outdir', '<(PRODUCT_DIR)',
-        ],
-        'irt_inputs_cmd':
-            'python build_nacl_irt.py --inputs',
       },
       'dependencies': [
         # TODO(gregoryd): chrome_resources and chrome_strings could be
         # shared with the 64-bit target, but it does not work due to a gyp
         #issue
         'chrome_resources',
         'chrome_strings',
         'common',
         '../webkit/support/webkit_support.gyp:glue',
         '../native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPluginChrome',
         '../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': [
-        ['OS=="win"', {
-          # Windows needs both the x86-32 and x86-64 IRT.
-          'actions': [
-            {
-              'action_name': 'nacl_irt',
-              'message': 'Building NaCl IRT',
-              'inputs': [
-                '<!@(<(irt_inputs_cmd) --platform=x86-32 --platform=x86-64)',
-              ],
-              'outputs': ['<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
-                          '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe'],
-              'action': [
-                '<@(irt_build_cmd)',
-                '--platform', 'x86-32',
-                '--platform', 'x86-64',
-              ],
-            },
-          ],
+        ['target_arch=="ia32"', {
+           'copies': [
+             {
+               'destination': '<(PRODUCT_DIR)',
+               'files': [
+                 '../native_client/irt_binaries/nacl_irt_x86_32.nexe',
+               ],
+             },
+           ],
         }],
-        ['OS!="win" and target_arch=="ia32"', {
-          # Linux-x86-32 and OSX need only the x86-32 IRT.
-          'actions': [
-            {
-              'action_name': 'nacl_irt',
-              'message': 'Building NaCl IRT',
-              'inputs': [
-                '<!@(<(irt_inputs_cmd) --platform=x86-32)',
-              ],
-              'outputs': ['<(PRODUCT_DIR)/nacl_irt_x86_32.nexe'],
-              'action': [
-                '<@(irt_build_cmd)', '--platform', 'x86-32',
-              ],
-            },
-          ],
-        }],
-        ['OS!="win" and target_arch=="x64"', {
-          # Linux-x86-64 needs only the x86-64 IRT.
-          'actions': [
-            {
-              'action_name': 'nacl_irt',
-              'message': 'Building NaCl IRT',
-              'inputs': [
-                '<!@(<(irt_inputs_cmd) --platform=x86-64)',
-              ],
-              'outputs': ['<(PRODUCT_DIR)/nacl_irt_x86_64.nexe'],
-              'action': [
-                '<@(irt_build_cmd)', '--platform', 'x86-64',
-              ],
-            },
-          ],
+        ['target_arch=="x64" or OS=="win"', {
+           'copies': [
+             {
+               'destination': '<(PRODUCT_DIR)',
+               'files': [
+                 '../native_client/irt_binaries/nacl_irt_x86_64.nexe',
+               ],
+             },
+           ],
         }],
       ],
     },
   ],
   'conditions': [
     ['OS=="win"', {
       'targets': [
         {
           'target_name': 'nacl_win64',
           'type': 'static_library',
@@ skipping 82 matching lines @@
                         # reference nacl_helper as a shared library
                         '<(PRODUCT_DIR)/nacl_helper.so',
                         '-Wl,-rpath,<(SHARED_LIB_DIR)',
                       ],
           },
         },
       ],
     }],
   ],
 }