diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-31 17:04:26 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-31 17:04:26 +0000 |
| commit | 1cf8a7873aea0ddff37b333945a7c90c8501f295 (patch) | |
| tree | b9d91c5ce3b70910d422f59d3b29d1cdbfbbc2b3 /chrome/tools | |
| parent | 49a2563a2fd3c7a337f60c7df5e9c86b8dea946d (diff) | |
| download | chromium_src-1cf8a7873aea0ddff37b333945a7c90c8501f295.zip chromium_src-1cf8a7873aea0ddff37b333945a7c90c8501f295.tar.gz chromium_src-1cf8a7873aea0ddff37b333945a7c90c8501f295.tar.bz2 | |
Adding back in NaCl files from chromeos staging/archiving lists.
They're now being build in the chroot.
BUG=94171
TEST=None
R=mmoss@google.com
Landing http://codereview.chromium.org/7767012/
(lost original client).
Review URL: http://codereview.chromium.org/7740082
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98992 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools')
| -rw-r--r-- | chrome/tools/build/chromeos/FILES.cfg | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/chrome/tools/build/chromeos/FILES.cfg b/chrome/tools/build/chromeos/FILES.cfg index 0ea442a..db0b2b7 100644 --- a/chrome/tools/build/chromeos/FILES.cfg +++ b/chrome/tools/build/chromeos/FILES.cfg @@ -108,30 +108,29 @@ FILES = [ 'buildtype': ['dev', 'official'], }, # Native Client plugin files: - # Currently disabled as per http://crbug.com/94171 -# { -# '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'], -# }, -# { -# 'filename': 'nacl_helper.so', -# 'arch': ['32bit', '64bit'], -# 'buildtype': ['dev', 'official'], -# }, -# { -# 'filename': 'nacl_helper_bootstrap', -# 'arch': ['32bit', '64bit'], -# 'buildtype': ['dev', 'official'], -# }, + { + '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'], + }, + { + 'filename': 'nacl_helper.so', + 'arch': ['32bit', '64bit'], + 'buildtype': ['dev', 'official'], + }, + { + 'filename': 'nacl_helper_bootstrap', + 'arch': ['32bit', '64bit'], + 'buildtype': ['dev', 'official'], + }, ] |