Chromium Code Reviews| Index: chrome/build_nacl_irt.py |
| diff --git a/chrome/build_nacl_irt.py b/chrome/build_nacl_irt.py |
| index cee765589b38fd9383fde22798f0d85573c1c393..10565f862600967b1ff5c784ddf8b7a8d167927e 100755 |
| --- a/chrome/build_nacl_irt.py |
| +++ b/chrome/build_nacl_irt.py |
| @@ -163,20 +163,29 @@ def BuildIRT(platforms, out_dir): |
| # Copy out each platform after stripping. |
| for platform in platforms: |
| uplatform = platform.replace('-', '_') |
| - platform2 = {'x86-32': 'i686', 'x86-64': 'x86_64'}.get(platform, platform) |
| + platform2 = {'arm': 'pnacl', 'x86-32': 'i686', 'x86-64': 'x86_64'}.get(platform, platform) |
|
noelallen_use_chromium
2011/10/21 00:16:51
Inconsistent checks of arm and arm-thumb2
jasonwkim
2011/10/21 20:16:56
fixed.
|
| cplatform = { |
| 'win32': 'win', |
| 'cygwin': 'win', |
| 'darwin': 'mac', |
| }.get(sys.platform, 'linux') |
| nexe = os.path.join(out_dir, 'nacl_irt_' + uplatform + '.nexe') |
| - cmd = [ |
| - '../native_client/toolchain/' + cplatform + '_x86_newlib/bin/' + |
| + if platform in ('arm', 'arm-thumb2'): |
|
noelallen_use_chromium
2011/10/21 00:16:51
nit: I think we typically use lists not tupples fo
noelallen_use_chromium
2011/10/21 00:16:51
and here.
jasonwkim
2011/10/21 20:16:56
fixed
jasonwkim
2011/10/21 20:16:56
fixed
|
| + cmd = [ |
| + '../native_client/toolchain/pnacl_linux_x86_64_newlib/bin/' + |
| + platform2 + '-strip', |
| + '--strip-debug', |
| + '../native_client/scons-out/nacl_irt-' + platform + '/staging/irt.nexe', |
| + '-o', nexe |
| + ] |
| + else: |
| + cmd = [ |
| + '../native_client/toolchain/' + cplatform + '_x86_newlib/bin/' + |
| platform2 + '-nacl-strip', |
| - '--strip-debug', |
| - '../native_client/scons-out/nacl_irt-' + platform + '/staging/irt.nexe', |
| - '-o', nexe |
| - ] |
| + '--strip-debug', |
| + '../native_client/scons-out/nacl_irt-' + platform + '/staging/irt.nexe', |
| + '-o', nexe |
| + ] |
| print 'Running: ' + ' '.join(cmd) |
| p = subprocess.Popen(cmd, cwd=SCRIPT_DIR) |
| p.wait() |