diff options
| author | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-10 18:45:25 +0000 |
|---|---|---|
| committer | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-10 18:45:25 +0000 |
| commit | 18e7450c31c39aec9581d10f79eb56c78957bcd5 (patch) | |
| tree | 0016cb4fdb053dd8b099376f7a89b80c88d371b6 /chrome/tools | |
| parent | 710fc6dda42e51bf1aa4f6c9b2c80359ef17ebcd (diff) | |
| download | chromium_src-18e7450c31c39aec9581d10f79eb56c78957bcd5.zip chromium_src-18e7450c31c39aec9581d10f79eb56c78957bcd5.tar.gz chromium_src-18e7450c31c39aec9581d10f79eb56c78957bcd5.tar.bz2 | |
NaCl: Add the integrated runtime (IRT) library to Windows install images
The dependencies in mini_installer.gyp should be OK, because the
target that produces chrome.exe also copies nacl_irt_* into
<(PRODUCT_DIR) as a side effect.
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/6995015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84826 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools')
| -rw-r--r-- | chrome/tools/build/win/FILES | 2 | ||||
| -rw-r--r-- | chrome/tools/build/win/FILES.cfg | 14 |
2 files changed, 16 insertions, 0 deletions
diff --git a/chrome/tools/build/win/FILES b/chrome/tools/build/win/FILES index 6c9e1cb..0ecbdfb 100644 --- a/chrome/tools/build/win/FILES +++ b/chrome/tools/build/win/FILES @@ -8,6 +8,8 @@ nacl64.dll crash_service.exe First Run ppGoogleNaClPluginChrome.dll +nacl_irt_x86_32.nexe +nacl_irt_x86_64.nexe icudt.dll locales/ar.dll locales/bg.dll diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg index 8d9a025..5736c14 100644 --- a/chrome/tools/build/win/FILES.cfg +++ b/chrome/tools/build/win/FILES.cfg @@ -363,9 +363,23 @@ FILES = [ 'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
+ # Native Client plugin files:
{
'filename': 'ppGoogleNaClPluginChrome.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
+ # Windows Chrome does not have separate x86-32 and x86-64 installs.
+ # A single install supports both x86-32 and x86-64 versions of NaCl,
+ # so the 'arch' field does not seem to make much sense in this case.
+ {
+ 'filename': 'nacl_irt_x86_32.nexe',
+ 'arch': ['32bit', '64bit'],
+ 'buildtype': ['dev', 'official'],
+ },
+ {
+ 'filename': 'nacl_irt_x86_64.nexe',
+ 'arch': ['32bit', '64bit'],
+ 'buildtype': ['dev', 'official'],
+ },
]
|