diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-19 05:35:38 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-19 05:35:38 +0000 |
| commit | c24100f116e1ad2728cabe08640aad779598431a (patch) | |
| tree | 217e092f080ff2e8f790c81f420ea88f2834b138 /chrome/nacl.gypi | |
| parent | 4b6bd69979c71edc1a1b9537c172098a71baf778 (diff) | |
| download | chromium_src-c24100f116e1ad2728cabe08640aad779598431a.zip chromium_src-c24100f116e1ad2728cabe08640aad779598431a.tar.gz chromium_src-c24100f116e1ad2728cabe08640aad779598431a.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97429 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl.gypi')
| -rw-r--r-- | chrome/nacl.gypi | 67 |
1 files changed, 46 insertions, 21 deletions
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi index bfc6652..9317b92 100644 --- a/chrome/nacl.gypi +++ b/chrome/nacl.gypi @@ -79,27 +79,52 @@ '<@(nacl_defines)', ], }, - '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', - ], - }, - ], - }], + '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', + ], + }], + ], + }], + ], + }, ], }, ], |