summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-11 21:58:47 +0000
committerbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-11 21:58:47 +0000
commit08a8ad95ade43689f5167c7a90c7be986fcee3d4 (patch)
tree585630e2edd9313c8f4d06f75d0f4af6cabb1376
parent993982c4e9ddbba79b1dab555797562e32189ff8 (diff)
downloadchromium_src-08a8ad95ade43689f5167c7a90c7be986fcee3d4.zip
chromium_src-08a8ad95ade43689f5167c7a90c7be986fcee3d4.tar.gz
chromium_src-08a8ad95ade43689f5167c7a90c7be986fcee3d4.tar.bz2
Adding ppGoogleNaClPluginChrome.dll to the list of stuff bundled
into chrome.packed.7z BUG=http://code.google.com/p/nativeclient/issues/detail?id=1418 TEST=None Review URL: http://codereview.chromium.org/6502008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74678 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/installer/mini_installer.gyp1
-rw-r--r--chrome/installer/mini_installer/chrome.release1
2 files changed, 2 insertions, 0 deletions
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
index 8f376cb..dac7bc1 100644
--- a/chrome/installer/mini_installer.gyp
+++ b/chrome/installer/mini_installer.gyp
@@ -178,6 +178,7 @@
'<(PRODUCT_DIR)/chrome.dll',
'<(PRODUCT_DIR)/nacl64.exe',
'<(PRODUCT_DIR)/nacl64.dll',
+ '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
'<(PRODUCT_DIR)/locales/en-US.dll',
'<(PRODUCT_DIR)/icudt42.dll',
],
diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release
index 23225e4..d5e01f6 100644
--- a/chrome/installer/mini_installer/chrome.release
+++ b/chrome/installer/mini_installer/chrome.release
@@ -34,6 +34,7 @@ Dictionaries\en-US.bdic: %(ChromeDir)s\Dictionaries
chrome.dll: %(VersionDir)s\
nacl64.exe: %(VersionDir)s\
nacl64.dll: %(VersionDir)s\
+ppGoogleNaClPluginChrome.dll: %(VersionDir)s\
icudt42.dll: %(VersionDir)s\
gears.dll: %(VersionDir)s\
resources.pak: %(VersionDir)s\