diff options
| author | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-05 15:52:29 +0000 |
|---|---|---|
| committer | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-05 15:52:29 +0000 |
| commit | ef2a0da696decfdb7eb2e275f8816b69ca12687b (patch) | |
| tree | 3e953b2994a8dda29fe0ea1a9def6c261e11c6f4 /chrome/chrome_dll.gypi | |
| parent | 0d1f4c47457e4f38ff79433783d79795eb5aad59 (diff) | |
| download | chromium_src-ef2a0da696decfdb7eb2e275f8816b69ca12687b.zip chromium_src-ef2a0da696decfdb7eb2e275f8816b69ca12687b.tar.gz chromium_src-ef2a0da696decfdb7eb2e275f8816b69ca12687b.tar.bz2 | |
NaCl: Add the integrated runtime (IRT) library to install images
Mac (x86-32 only):
chrome/chrome_dll.gypi
Linux (x86-32 or x86-64, depending on the target arch):
chrome/chrome_installer.gypi
chrome/tools/build/linux/FILES.cfg
Windows (both x86-32 and x86-64 in the same install image)
chrome/installer/mini_installer.gyp
chrome/installer/mini_installer/chrome.release
chrome/tools/build/win/FILES.cfg
I am not sure if I need to add to the lists in
chrome/tools/build/{linux,win}/FILES. Since there are files listed in
FILES.cfg that are not in FILES, I will assume not.
BUG=http://code.google.com/p/nativeclient/issues/detail?id=1595
TEST=not sure how to test this, apart from manually testing the
install images that are produced after this is committed
Review URL: http://codereview.chromium.org/6927015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84252 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_dll.gypi')
| -rw-r--r-- | chrome/chrome_dll.gypi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index c3a0b05..110a915 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -477,6 +477,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', ], }], ], |