diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-23 23:51:25 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-23 23:51:25 +0000 |
| commit | c532ba7b52bed035470d1e9eb1ec17861b887d68 (patch) | |
| tree | 2c33844fb4025c60a8e25eedb03312868da962a0 /chrome/nacl.gypi | |
| parent | 5d5cc65756ad8f193205a8a03ae1e8225733a8ce (diff) | |
| download | chromium_src-c532ba7b52bed035470d1e9eb1ec17861b887d68.zip chromium_src-c532ba7b52bed035470d1e9eb1ec17861b887d68.tar.gz chromium_src-c532ba7b52bed035470d1e9eb1ec17861b887d68.tar.bz2 | |
Revert 97943 - Switching NaCl IRT to be built inside the chrome build.
Third attempt:
Switching IRT to be built inside the chrome build. Dropping the IRT download
step from the DEPS. Step3 of a many step plan to switch where ppapi + irt
are built.
Dropping download_nacl_irt because we no longer rely on a prebuilt copy.
Dropping irt download drop source tarball (assume people using it will have
to download / build their own nacl toolchain).
Old Review URL: http://codereview.chromium.org/7669058
R=noelallen@google.com
BUG=http://code.google.com/p/chromium/issues/detail?id=93520
TEST=None
Review URL: http://codereview.chromium.org/7685042
TBR=bradnelson@google.com
Review URL: http://codereview.chromium.org/7718016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97949 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl.gypi')
| -rw-r--r-- | chrome/nacl.gypi | 72 |
1 files changed, 18 insertions, 54 deletions
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', + ], + }, + ], }], ], }, |