diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-19 05:42:12 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-19 05:42:12 +0000 |
| commit | 805009ad9ffc979571f1d981a362358e32d4b054 (patch) | |
| tree | bf336f066f63d22b702faec648965f5ebd7a72dd /chrome/nacl.gypi | |
| parent | 96a2762c859e7eae719c4065de33da9851336d5d (diff) | |
| download | chromium_src-805009ad9ffc979571f1d981a362358e32d4b054.zip chromium_src-805009ad9ffc979571f1d981a362358e32d4b054.tar.gz chromium_src-805009ad9ffc979571f1d981a362358e32d4b054.tar.bz2 | |
Revert 97429 - 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 live / are built.
BUG=None
TEST=None
R=noelallen@google.com,brettw@chromium.org
Review URL: http://codereview.chromium.org/7669058
TBR=bradnelson@google.com
Review URL: http://codereview.chromium.org/7687004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl.gypi')
| -rw-r--r-- | chrome/nacl.gypi | 67 |
1 files changed, 21 insertions, 46 deletions
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi index 9317b92..bfc6652 100644 --- a/chrome/nacl.gypi +++ b/chrome/nacl.gypi @@ -79,52 +79,27 @@ '<@(nacl_defines)', ], }, - 'actions': [ - { - 'action_name': 'nacl_irt', - 'message': 'Building NaCl IRT', - 'variables': { - 'irt_build_cmd': [ - 'python', 'build_nacl_irt.py', '--outdir', '<(PRODUCT_DIR)', - ], - 'irt_inputs_cmd': - 'python build_nacl_irt.py --inputs', - }, - 'conditions': [ - ['OS=="win"', { - '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', - ], - }, { - 'conditions': [ - ['target_arch=="ia32"', { - 'inputs': [ - '<!@(<(irt_inputs_cmd) --platform=x86-32)', - ], - 'outputs': ['<(PRODUCT_DIR)/nacl_irt_x86_32.nexe'], - 'action': [ - '<@(irt_build_cmd)', '--platform', 'x86-32', - ], - }, { # target_arch=="x64" - 'inputs': [ - '<!@(<(irt_inputs_cmd) --platform=x86-64)', - ], - 'outputs': ['<(PRODUCT_DIR)/nacl_irt_x86_64.nexe'], - 'action': [ - '<@(irt_build_cmd)', '--platform', 'x86-64', - ], - }], - ], - }], - ], - }, + 'conditions': [ + ['target_arch=="ia32"', { + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)', + 'files': [ + '../native_client/irt_binaries/nacl_irt_x86_32.nexe', + ], + }, + ], + }], + ['target_arch=="x64" or OS=="win"', { + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)', + 'files': [ + '../native_client/irt_binaries/nacl_irt_x86_64.nexe', + ], + }, + ], + }], ], }, ], |