Chromium Code Reviews| Index: chrome/nacl.gypi |
| =================================================================== |
| --- chrome/nacl.gypi (revision 97323) |
| +++ chrome/nacl.gypi (working copy) |
| @@ -79,27 +79,36 @@ |
| '<@(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', |
| + 'action': [ |
| + 'python', 'build_nacl_irt.py', |
| + '--outdir', '<(PRODUCT_DIR)', |
| + ], |
| + 'inputs': [ |
| + '<!@(python build_nacl_irt.py --inputs --platform=x86-32 --platform=x86-64)', |
| + ], |
| + 'conditions': [ |
| + ['target_arch=="ia32"', { |
| + 'outputs': [ |
| + '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', |
| + ], |
| + 'action': [ |
|
noelallen_use_chromium
2011/08/18 19:11:16
I've never seen the case of appending to an action
|
| + '--platform', 'x86-32', |
| + ], |
| + }], |
| + ['target_arch=="x64" or OS=="win"', { |
| + 'outputs': [ |
| + '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', |
| + ], |
| + 'action': [ |
| + '--platform', 'x86-64', |
| + ], |
| + }], |
| + ], |
| + }, |
| ], |
| }, |
| ], |