diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-22 22:18:12 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-22 22:18:12 +0000 |
| commit | b670a41eb7c077adac3889df61f57710e29920bf (patch) | |
| tree | 84b349165c9806ca59c1c30faba919cdd358b6b2 /chrome/nacl.gypi | |
| parent | acc3d8e973805f8ecd2ab2d31d5f4cddeadfc4e6 (diff) | |
| download | chromium_src-b670a41eb7c077adac3889df61f57710e29920bf.zip chromium_src-b670a41eb7c077adac3889df61f57710e29920bf.tar.gz chromium_src-b670a41eb7c077adac3889df61f57710e29920bf.tar.bz2 | |
Attempting to re-land 97421 (with different deps revs):
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.
Review URL: http://codereview.chromium.org/7669058
R=noelallen@google.com
BUG=None
TEST=None
TBR
Review URL: http://codereview.chromium.org/7685002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97753 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl.gypi')
| -rw-r--r-- | chrome/nacl.gypi | 72 |
1 files changed, 54 insertions, 18 deletions
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi index bfc6652..95c7263 100644 --- a/chrome/nacl.gypi +++ b/chrome/nacl.gypi @@ -59,6 +59,11 @@ '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 @@ -80,25 +85,56 @@ ], }, 'conditions': [ - ['target_arch=="ia32"', { - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)', - 'files': [ - '../native_client/irt_binaries/nacl_irt_x86_32.nexe', - ], - }, - ], + ['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=="x64" or OS=="win"', { - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)', - 'files': [ - '../native_client/irt_binaries/nacl_irt_x86_64.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', + ], + }, + ], }], ], }, |