summaryrefslogtreecommitdiffstats
path: root/chrome/tools
diff options
context:
space:
mode:
authorbradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-17 22:02:43 +0000
committerbradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-17 22:02:43 +0000
commit6895bf926cba01ef455bb7327703aa5378a46488 (patch)
treeb4bc5c1f9c6d45b8e30828583e06550c67c7b966 /chrome/tools
parentd5a4249889aee8884b38030625007c09937b1f05 (diff)
downloadchromium_src-6895bf926cba01ef455bb7327703aa5378a46488.zip
chromium_src-6895bf926cba01ef455bb7327703aa5378a46488.tar.gz
chromium_src-6895bf926cba01ef455bb7327703aa5378a46488.tar.bz2
Adding nacl_helper to Chrome Linux installer.
Renamed nacl_helper to nacl_helper.so to reflect its true nature. Attempt to add nacl_helper to chrome installer. BUG=92964,nativeclient:480,nativeclient:2131 TEST=manual for now Review URL: http://codereview.chromium.org/7624017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97218 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools')
-rw-r--r--chrome/tools/build/linux/FILES2
-rw-r--r--chrome/tools/build/linux/FILES.cfg10
2 files changed, 12 insertions, 0 deletions
diff --git a/chrome/tools/build/linux/FILES b/chrome/tools/build/linux/FILES
index 6da5522..954aa65 100644
--- a/chrome/tools/build/linux/FILES
+++ b/chrome/tools/build/linux/FILES
@@ -14,3 +14,5 @@ libpdf.so
libppGoogleNaClPluginChrome.so
nacl_irt_x86_32.nexe
nacl_irt_x86_64.nexe
+nacl_helper.so
+nacl_helper_bootstrap
diff --git a/chrome/tools/build/linux/FILES.cfg b/chrome/tools/build/linux/FILES.cfg
index be3a61f..db0b2b7 100644
--- a/chrome/tools/build/linux/FILES.cfg
+++ b/chrome/tools/build/linux/FILES.cfg
@@ -123,4 +123,14 @@ FILES = [
'arch': ['64bit'],
'buildtype': ['dev', 'official'],
},
+ {
+ 'filename': 'nacl_helper.so',
+ 'arch': ['32bit', '64bit'],
+ 'buildtype': ['dev', 'official'],
+ },
+ {
+ 'filename': 'nacl_helper_bootstrap',
+ 'arch': ['32bit', '64bit'],
+ 'buildtype': ['dev', 'official'],
+ },
]