diff options
| author | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-09 18:12:34 +0000 |
|---|---|---|
| committer | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-09 18:12:34 +0000 |
| commit | 93eb46a8d34c17d9303d4f7a8189ade27d05f9f8 (patch) | |
| tree | 7e68d74f2d5d9ed0c242f63dab8430c8102ea57c /chrome/tools | |
| parent | f96dedffcec020eadc33558529297b644db6709f (diff) | |
| download | chromium_src-93eb46a8d34c17d9303d4f7a8189ade27d05f9f8.zip chromium_src-93eb46a8d34c17d9303d4f7a8189ade27d05f9f8.tar.gz chromium_src-93eb46a8d34c17d9303d4f7a8189ade27d05f9f8.tar.bz2 | |
NaCl: Add the integrated runtime (IRT) library to Linux install images
The dependencies should be OK here, because the parts that depend on
'<(PRODUCT_DIR)/nacl_irt_*' also depend on '<(PRODUCT_DIR)/chrome',
and this target has the side effect of installing 'nacl_irt_*' into
'<(PRODUCT_DIR)'.
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/6970002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84644 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools')
| -rw-r--r-- | chrome/tools/build/linux/FILES | 2 | ||||
| -rw-r--r-- | chrome/tools/build/linux/FILES.cfg | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/chrome/tools/build/linux/FILES b/chrome/tools/build/linux/FILES index d9bbfaa..e74fa0a 100644 --- a/chrome/tools/build/linux/FILES +++ b/chrome/tools/build/linux/FILES @@ -11,3 +11,5 @@ resources.pak xdg-settings libpdf.so libppGoogleNaClPluginChrome.so +nacl_irt_x86_32.nexe +nacl_irt_x86_64.nexe diff --git a/chrome/tools/build/linux/FILES.cfg b/chrome/tools/build/linux/FILES.cfg index 44272ed..921b467 100644 --- a/chrome/tools/build/linux/FILES.cfg +++ b/chrome/tools/build/linux/FILES.cfg @@ -102,9 +102,20 @@ FILES = [ 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, + # Native Client plugin files: { 'filename': 'libppGoogleNaClPluginChrome.so', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, + { + 'filename': 'nacl_irt_x86_32.nexe', + 'arch': ['32bit'], + 'buildtype': ['dev', 'official'], + }, + { + 'filename': 'nacl_irt_x86_64.nexe', + 'arch': ['64bit'], + 'buildtype': ['dev', 'official'], + }, ] |