Fix size regression due to missing strip.

chrome/strip_nacl_irt.py

Index: chrome/strip_nacl_irt.py
===================================================================
--- chrome/strip_nacl_irt.py	(revision 0)
+++ chrome/strip_nacl_irt.py	(revision 0)
@@ -0,0 +1,76 @@
+#!/usr/bin/python

[Ryan Sleevi, 2011/11/12 02:52:51]

In my msys checkout, this has historically caused problems.

#!/usr/bin/env python

Although from gyp, at least, you're invoking directly with python_exe, so this
is not critical.

[noelallen1, 2011/11/12 03:00:54]

We allow cygwin for Windows in NaCl land.  But yeah we always run python just in
case.

This is sta

[Ryan Sleevi, 2011/11/12 03:07:14]

Right, I know the Google Open-Source Python guide says to use #!/usr/bin/python
(or #!/usr/bin/python{version}), but within the Chromium tree, scripts are more
evenly split between #!/usr/bin/python and #!/usr/bin/env python

The latter is so that the hermetic python (from depot_tools) can be located,
rather than the one bundled (which, in the case of msys, there is none)

+# 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:
+    platforms: list of platform names to build for.
+    out_dir: directory to output the IRT to.
+  """
+  uplatform = platform.replace('-', '_')

[Ryan Sleevi, 2011/11/12 02:52:51]

This variable seems is never used.

Did you mean to use uplatform as the default for missing platforms on line 34?

[noelallen1, 2011/11/12 03:00:54]

Lol, looks like a bug in the original I pulled this from.
Done.

+  # 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, platform)
+  cplatform = {
+      'win32': 'win',
+      'cygwin': 'win',
+      'darwin': 'mac',
+  }.get(sys.platform, 'linux')

[Ryan Sleevi, 2011/11/12 02:52:51]

I suspect it's not an issue, but any concern for the freebsd builds? TODO patch
later? Or is 'linux' ok here?

[noelallen1, 2011/11/12 03:00:54]

We don't support it yet so...

+  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)
Property changes on: chrome/strip_nacl_irt.py
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:eol-style
   + LF