diff options
| author | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-11 09:32:29 +0000 |
|---|---|---|
| committer | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-11 09:32:29 +0000 |
| commit | 837c88b9a8072ca14f9a32b4ed369e499d64eac4 (patch) | |
| tree | 01c480281ee24455fe658519c76f73eafe3d6159 /chrome | |
| parent | 613005cfa0a3a9cba63d539cb190136e54cc0bd8 (diff) | |
| download | chromium_src-837c88b9a8072ca14f9a32b4ed369e499d64eac4.zip chromium_src-837c88b9a8072ca14f9a32b4ed369e499d64eac4.tar.gz chromium_src-837c88b9a8072ca14f9a32b4ed369e499d64eac4.tar.bz2 | |
NaCl: Add the integrated runtime (IRT) library to Mac install images
We add a copy step to 'chrome_dll'. Previously nacl_irt_* was copied
into <(PRODUCT_DIR) by 'chrome_exe', which depends on 'chrome_dll'.
Since we don't want an undeclared circular dependency of 'chrome_dll'
on 'chrome_exe', we move the earlier copy step into the 'nacl' target,
which 'chrome_dll' already depends on.
This means that the check for 'disable_nacl' is no longer necessary,
since the 'nacl' target is conditionally depended on.
BUG=http://code.google.com/p/nativeclient/issues/detail?id=1595
TEST=do a clean build on Mac, at least with xcodebuild/Debug/nacl_irt_*
not present to start with
Review URL: http://codereview.chromium.org/6997013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84961 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome_dll.gypi | 3 | ||||
| -rw-r--r-- | chrome/chrome_exe.gypi | 11 | ||||
| -rw-r--r-- | chrome/nacl.gypi | 9 |
3 files changed, 12 insertions, 11 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 930acae..b398995 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -479,6 +479,9 @@ ['disable_nacl!=1', { 'files': [ '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.plugin', + # We leave out nacl_irt_x86_64.nexe because we only + # support x86-32 NaCl on Mac OS X. + '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', ], }], ], diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index 59cd001..73a6c44 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -470,17 +470,6 @@ }, }, }], - ['disable_nacl!=1', { - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)', - 'files': [ - '../native_client/irt_binaries/nacl_irt_x86_32.nexe', - '../native_client/irt_binaries/nacl_irt_x86_64.nexe', - ], - }, - ], - }], ], }, { diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi index 1d9ab38..84da264 100644 --- a/chrome/nacl.gypi +++ b/chrome/nacl.gypi @@ -81,6 +81,15 @@ '<@(nacl_defines)', ], }, + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)', + 'files': [ + '../native_client/irt_binaries/nacl_irt_x86_32.nexe', + '../native_client/irt_binaries/nacl_irt_x86_64.nexe', + ], + }, + ], }, ], 'conditions': [ |