Revert 109764 - Fix size regression due to missing strip.

Add a strip script based on the old build_nacl_irt.py (just keep strip piece)
Rename nacl_irt target to nacl_irt_unstripped and add a new target called
nacl_irt which strips the previous target.
Review URL: http://codereview.chromium.org/8539039

TBR=noelallen@google.com
Review URL: http://codereview.chromium.org/8538036

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109766 0039d316-1c4b-4281-b951-d872f2087c98

chrome/strip_nacl_irt.py

-#!/usr/bin/python
-# 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.
-
-import optparse
-import os
-import re
-import shutil
-import subprocess
-import sys
-
-
-# Where things are in relation to this script.
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-SRC_DIR = os.path.dirname(SCRIPT_DIR)
-NACL_DIR = os.path.join(SRC_DIR, 'native_client')
-
-
-def StripIRT(platform, src, dst):
-  """Build the IRT for several platforms.
-
-  Arguments:
-    platform: is the name of the platform to build for.
-    src: path to the input NEXE.
-    dst: path to the output NEXE.
-  """
-  uplatform = platform.replace('-', '_')
-  # NaCl Trusted code is in thumb2 mode in CrOS, but as yet,
-  # untrusted code is still in classic ARM mode
-  # arm-thumb2 is for the future when untrusted code is in thumb2 as well
-  platform2 = {'arm': 'pnacl',
-               'arm-thumb2' : 'pnacl',
-               'x86-32': 'i686',
-               'x86-64': 'x86_64'}.get(platform, uplatform)
-  cplatform = {
-      'win32': 'win',
-      'cygwin': 'win',
-      'darwin': 'mac',
-  }.get(sys.platform, 'linux')
-  if platform in ['arm', 'arm-thumb2']:
-    cmd = [
-        '../native_client/toolchain/pnacl_linux_x86_64_newlib/bin/' +
-        platform2 + '-strip',
-        '--strip-debug', src, '-o', dst
-        ]
-  else:
-    cmd = [
-        '../native_client/toolchain/' + cplatform + '_x86_newlib/bin/' +
-        platform2 + '-nacl-strip',
-        '--strip-debug', src, '-o', dst
-        ]
-  print 'Running: ' + ' '.join(cmd)
-  p = subprocess.Popen(cmd, cwd=SCRIPT_DIR)
-  p.wait()
-  if p.returncode != 0:
-    sys.exit(4)
-
-
-def Main(argv):
-  parser = optparse.OptionParser()
-  parser.add_option('--platform', dest='platforms',
-                    help='select a platform to strip')
-  parser.add_option('--src', dest='src',
-                    help='source IRT file')
-  parser.add_option('--dst', dest='dst',
-                    help='destination IRT file')
-  (options, args) = parser.parse_args(argv[1:])
-  if args or not options.platforms:
-    parser.print_help()
-    sys.exit(1)
-
-  StripIRT(options.platforms, options.src, options.dst)
-
-
-if __name__ == '__main__':
-  Main(sys.argv)

ppapi/native_client/native_client.gyp

@@ -32,12 +32,12 @@
           ],
         },
         {
-          'target_name': 'nacl_irt_unstripped',
+          'target_name': 'nacl_irt',
           'type': 'none',
           'variables': {
             'nexe_target': 'nacl_irt',
-            'out64': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/nacl_irt_x86_64.nexe',
-            'out32': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/nacl_irt_x86_32.nexe',
+            'out64': '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
+            'out32': '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
             'build_glibc': 0,
             'build_newlib': 1,
             'include_dirs': [
@@ -84,67 +84,6 @@
             '../../native_client/src/shared/gio/gio.gyp:gio_lib',
           ],
         },
-        {
-          'target_name': 'nacl_irt',
-          'type': 'none',
-          'dependencies': [
-            'nacl_irt_unstripped',
-          ],
-          'conditions': [
-            ['target_arch=="ia32"', {
-              'actions': [
-                {
-                  'action_name': 'strip x86-32 irt',
-                  'msvs_cygwin_shell': 0,
-                  'description': 'Strip x86-32 nacl_irt)',
-                  'inputs': [
-                     '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/nacl_irt_x86_32.nexe',
-                     '../../chrome/strip_nacl_irt.py',
-                  ],
-                  'outputs': [
-                    '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
-                  ],
-                  'action': [
-                     '>(python_exe)',
-                     '../../chrome/strip_nacl_irt.py',
-                     '--platform',
-                     'x86-32'
-                     '--src',
-                     '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/nacl_irt_x86_32.nexe',
-                     '--dst',
-                     '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe'
-                  ],
-                },
-              ],
-            }],
-            ['target_arch=="x64" or OS=="win"', {
-              'actions': [
-                {
-                  'action_name': 'strip x86-64 irt',
-                  'msvs_cygwin_shell': 0,
-                  'description': 'Strip x86-64 nacl_irt)',
-                  'inputs': [
-                     '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/nacl_irt_x86_64.nexe',
-                     '../../chrome/strip_nacl_irt.py',
-                  ],
-                  'outputs': [
-                    '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
-                  ],
-                  'action': [
-                     '>(python_exe)',
-                     '../../chrome/strip_nacl_irt.py',
-                     '--platform',
-                     'x86-64',
-                     '--src',
-                     '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/nacl_irt_x86_64.nexe',
-                     '--dst',
-                     '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe'
-                  ],
-                },
-              ],
-            }],
-          ],
-        },
       ],
     }],
   ],