summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DEPS31
-rw-r--r--chrome/build_nacl_irt.py164
-rw-r--r--chrome/nacl.gypi72
3 files changed, 40 insertions, 227 deletions
diff --git a/DEPS b/DEPS
index adeed07..ae96b33 100644
--- a/DEPS
+++ b/DEPS
@@ -7,6 +7,10 @@ vars = {
"webkit_revision": "93506",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281",
+ # These hashes need to be updated when nacl_revision is changed.
+ # After changing nacl_revision, run 'gclient runhooks' to get the new values.
+ "nacl_irt_hash_x86_32": "3da71eefa07c815a1aed9dc3a379fc41efda4b6b",
+ "nacl_irt_hash_x86_64": "147077c09e87ff2db20d32af2054bfb4de343c20",
"nacl_revision": "6499",
# After changing nacl_revision, run 'glient sync' and check native_client/DEPS
# to update other nacl_*_revision's.
@@ -19,12 +23,12 @@ vars = {
# After changing nacl_toolchain_revision, run 'gclient runhooks' to get the
# new values.
"nacl_toolchain_mac_x86_newlib_hash":
- "1b0855435c03c435a011c6105a509624b2a4edaa",
+ "be4cc2baf6eb34c8fe155a1bb61e2acd8ca1e924",
"nacl_toolchain_win_x86_newlib_hash":
- "5038a47b5a9a49acdc36cbe311aec7bce575c164",
+ "56667d7f653b1005cd5116de3d8e9faf346053cf",
"nacl_toolchain_linux_x86_newlib_hash":
- "01e245dc6dca16bea5cf840dbc77e3aa138f234f",
- "nacl_toolchain_revision": "6494",
+ "5e4876a1fa53c7701cdbeef969a99b3ff0b0ddc5",
+ "nacl_toolchain_revision": "6429",
"libjingle_revision": "77",
"libvpx_revision": "97420",
@@ -406,6 +410,20 @@ skip_child_includes = [
hooks = [
{
+ # A change to a .gyp, .gypi, or to GYP itself should run the generator.
+ "pattern": ".",
+ "action": ["python", "src/build/gyp_chromium"],
+ },
+ {
+ # This downloads binaries for Native Client's integrated runtime (IRT)
+ # library, which is built as NaCl untrusted code.
+ "pattern": ".",
+ "action": ["python", "src/build/download_nacl_irt.py",
+ "--nacl_revision", Var("nacl_revision"),
+ "--file_hash", "x86_32", Var("nacl_irt_hash_x86_32"),
+ "--file_hash", "x86_64", Var("nacl_irt_hash_x86_64")],
+ },
+ {
# This downloads binaries for Native Client's newlib toolchain.
# Done in lieu of building the toolchain from scratch as it can take
# anywhere from 30 minutes to 4 hours depending on platform to build.
@@ -422,9 +440,4 @@ hooks = [
Var("nacl_toolchain_linux_x86_newlib_hash"),
],
},
- {
- # A change to a .gyp, .gypi, or to GYP itself should run the generator.
- "pattern": ".",
- "action": ["python", "src/build/gyp_chromium"],
- },
]
diff --git a/chrome/build_nacl_irt.py b/chrome/build_nacl_irt.py
deleted file mode 100644
index 6489d39..0000000
--- a/chrome/build_nacl_irt.py
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/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')
-
-# Pathing to the two command_buffer directories (relative to native_client).
-NACL_CMD_BUFFER_DIR = os.path.join('src', 'shared',
- 'ppapi_proxy', 'command_buffer')
-GPU_CMD_BUFFER_DIR = os.path.join('..', 'gpu', 'command_buffer')
-
-
-def RelativePath(path, base):
- """Find the relative path.
-
- Arguments:
- path: path we want a relative path to.
- base: path we want a relative path from.
- Returns:
- The relative path from base to path.
- """
- path = os.path.abspath(path)
- base = os.path.abspath(base)
- path_parts = path.split(os.sep)
- base_parts = base.split(os.sep)
- while path_parts and base_parts and path_parts[0] == base_parts[0]:
- path_parts = path_parts[1:]
- base_parts = base_parts[1:]
- rel_parts = ['..'] * len(base_parts) + path_parts
- return os.sep.join(rel_parts)
-
-
-def PrintInputs(platforms):
- """Print all the transitive inputs required to build the IRT.
-
- Arguments:
- platforms: list of platform names to build for.
- """
- inputs = set()
- for platform in platforms:
- # Invoke scons to get dependency tree.
- cmd = [
- sys.executable, 'scons.py', '-n', '--tree=all',
- '--mode=nacl', 'platform=' + platform,
- 'scons-out/nacl_irt-' + platform + '/staging/irt.nexe',
- ]
- p = subprocess.Popen(cmd, cwd=NACL_DIR,
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE)
- (p_stdout, p_stderr) = p.communicate()
- if p.returncode != 0:
- sys.exit(2)
- # Extract unique inputs.
- for line in p_stdout.splitlines():
- m = re.match('^[ -+|]*\+\-(.+)', line)
- if not m:
- continue
- filename = m.group(1)
- if '[' in filename:
- continue
- if filename.startswith('scons-out'):
- continue
- if filename.endswith('.nexe'):
- continue
- # Apply the underlay of gpu/command_buffer (to match scons).
- if filename.startswith(NACL_CMD_BUFFER_DIR + os.sep):
- filename = GPU_CMD_BUFFER_DIR + filename[len(NACL_CMD_BUFFER_DIR):]
- inputs.add(filename)
- # Check that everything exists and make it script relative.
- rel_inputs = set()
- for f in inputs:
- nf = os.path.join(NACL_DIR, f)
- if not os.path.exists(nf):
- raise Exception('missing input file "%s"' % nf)
- rel_inputs.add(RelativePath(nf, SCRIPT_DIR))
- # Print it sorted.
- rel_inputs = sorted(list(rel_inputs))
- for f in rel_inputs:
- print f
-
-
-def BuildIRT(platforms, out_dir):
- """Build the IRT for several platforms.
-
- Arguments:
- platforms: list of platform names to build for.
- out_dir: directory to output the IRT to.
- """
- # Clean.
- scons_out = os.path.join(NACL_DIR, 'scons-out')
- if os.path.exists(scons_out):
- shutil.rmtree(scons_out)
- # Build for each platform.
- for platform in platforms:
- cmd = [
- sys.executable, 'scons.py', '--verbose', '-j8',
- '--mode=nacl', 'platform=' + platform,
- 'scons-out/nacl_irt-' + platform + '/staging/irt.nexe',
- ]
- print 'Running: ' + ' '.join(cmd)
- p = subprocess.Popen(cmd, cwd=NACL_DIR)
- p.wait()
- if p.returncode != 0:
- sys.exit(3)
- # Copy out each platform after stripping.
- for platform in platforms:
- uplatform = platform.replace('-', '_')
- platform2 = {'x86-32': 'i686', 'x86-64': 'x86_64'}.get(platform, platform)
- 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/' +
- platform2 + '-nacl-strip',
- '--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()
- if p.returncode != 0:
- sys.exit(4)
-
-
-def Main(argv):
- parser = optparse.OptionParser()
- parser.add_option('--inputs', dest='inputs', default=False,
- action='store_true',
- help='only emit the transitive inputs to the irt build')
- parser.add_option('--platform', dest='platforms', action='append',
- default=[],
- help='add a platform to build for (x86-32|x86-64)')
- parser.add_option('--outdir', dest='outdir',
- help='directory to out irt to')
- (options, args) = parser.parse_args(argv[1:])
- if args or not options.platforms or (
- not options.inputs and not options.outdir):
- parser.print_help()
- sys.exit(1)
-
- if options.inputs:
- PrintInputs(options.platforms)
- else:
- BuildIRT(options.platforms, options.outdir)
-
-
-if __name__ == '__main__':
- Main(sys.argv)
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi
index 95c7263..bfc6652 100644
--- a/chrome/nacl.gypi
+++ b/chrome/nacl.gypi
@@ -59,11 +59,6 @@
'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
@@ -85,56 +80,25 @@
],
},
'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',
- ],
- },
- ],
- }],
- ['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',
- ],
- },
- ],
+ ['target_arch=="ia32"', {
+ 'copies': [
+ {
+ 'destination': '<(PRODUCT_DIR)',
+ 'files': [
+ '../native_client/irt_binaries/nacl_irt_x86_32.nexe',
+ ],
+ },
+ ],
}],
- ['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',
+ ],
+ },
+ ],
}],
],
},
generated by cgit v1.1 at 2025-03-01 09:26:15 +0000