diff options
| author | olonho@google.com <olonho@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-03 16:14:52 +0000 |
|---|---|---|
| committer | olonho@google.com <olonho@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-03 16:14:52 +0000 |
| commit | 5386cb24d9320c6fbf0a3ac111c23532838520f2 (patch) | |
| tree | cec2349c41885f0deb76e22187de00d84434114f /build | |
| parent | fad6457d22a6f33448fe53d90f3bae9f1c2da9b2 (diff) | |
| download | chromium_src-5386cb24d9320c6fbf0a3ac111c23532838520f2.zip chromium_src-5386cb24d9320c6fbf0a3ac111c23532838520f2.tar.gz chromium_src-5386cb24d9320c6fbf0a3ac111c23532838520f2.tar.bz2 | |
Support for ARM NaCl untrusted runtime build.
This one depends on https://chromiumcodereview.appspot.com/9816003/
on NaCl side and indeed produces working untrusted runtime.
BUG= http://code.google.com/p/nativeclient/issues/detail?id=2687
TEST=Compile for ARM with "GYP_DEFINES="target_arch=arm sysroot=~/rootfs/" and run DOSBox with produced untrusted runtime.
Review URL: https://chromiumcodereview.appspot.com/9838005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130386 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/download_nacl_toolchains.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/build/download_nacl_toolchains.py b/build/download_nacl_toolchains.py index 2fdfa00..6b00841 100755 --- a/build/download_nacl_toolchains.py +++ b/build/download_nacl_toolchains.py @@ -34,8 +34,18 @@ def Main(args): # gclient sync time for developers, or standard Chrome bots. if '--optional-pnacl' in args: args.remove('--optional-pnacl') + # By default we don't use PNaCl toolchain yet, unless on ARM, where + # there is no other toolchain to build untrusted code at the moment. + # So analyze if we're building for ARM, or on SDK buildbot. + # TODO(olonho): we need to invent more reliable way to get build + # configuration info, to know if we're building for ARM. + use_pnacl = False + if 'target_arch=arm' in os.environ.get('GYP_DEFINES', ''): + use_pnacl = True buildbot_name = os.environ.get('BUILDBOT_BUILDERNAME', '') if buildbot_name.find('pnacl') >= 0 and buildbot_name.find('sdk') >= 0: + use_pnacl = True + if use_pnacl: print '\n*** DOWNLOADING PNACL TOOLCHAIN ***\n' else: args.append('--no-pnacl') @@ -46,4 +56,3 @@ def Main(args): if __name__ == '__main__': sys.exit(Main(sys.argv[1:])) - |