summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_installer.gypi
diff options
context:
space:
mode:
authormseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-05 15:52:29 +0000
committermseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-05 15:52:29 +0000
commitef2a0da696decfdb7eb2e275f8816b69ca12687b (patch)
tree3e953b2994a8dda29fe0ea1a9def6c261e11c6f4 /chrome/chrome_installer.gypi
parent0d1f4c47457e4f38ff79433783d79795eb5aad59 (diff)
downloadchromium_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_installer.gypi')
-rw-r--r--chrome/chrome_installer.gypi4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
index ebe0f07..fb7adbe 100644
--- a/chrome/chrome_installer.gypi
+++ b/chrome/chrome_installer.gypi
@@ -425,11 +425,15 @@
'packaging_files_binaries': [
'<(PRODUCT_DIR)/libgcflashplayer.so',
'<(PRODUCT_DIR)/plugin.vch',
+ '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
],
}],
['target_arch=="x64"', {
'deb_arch': 'amd64',
'rpm_arch': 'x86_64',
+ 'packaging_files_binaries': [
+ '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
+ ],
}],
['target_arch=="arm"', {
'deb_arch': 'arm',