diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-19 04:40:21 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-19 04:40:21 +0000 |
| commit | ca7e7364bd713d29e89b224935913b3f59ea5030 (patch) | |
| tree | 32edf1a5931ef6cee99e9b8858fd896089f4a3b5 /chrome | |
| parent | 6a4c8e688fca92cecd35e112646162dfeb371b11 (diff) | |
| download | chromium_src-ca7e7364bd713d29e89b224935913b3f59ea5030.zip chromium_src-ca7e7364bd713d29e89b224935913b3f59ea5030.tar.gz chromium_src-ca7e7364bd713d29e89b224935913b3f59ea5030.tar.bz2 | |
To get Chrome to find the NaCl plug-in on Mac, we need to copy the plugin
bundle into the Chrome bundle.
Review URL: http://codereview.chromium.org/5939001/
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69673 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome_dll.gypi | 4 | ||||
| -rw-r--r-- | chrome/nacl.gypi | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 267382f..b95d02e 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -469,7 +469,9 @@ }, { 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins', - 'files': [], + 'files': [ + '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.plugin', + ], 'conditions': [ [ 'branding == "Chrome"', { 'files': [ diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi index f3a179d..5947d6a 100644 --- a/chrome/nacl.gypi +++ b/chrome/nacl.gypi @@ -71,6 +71,7 @@ '../third_party/npapi/npapi.gyp:npapi', '../webkit/support/webkit_support.gyp:glue', '../native_client/src/trusted/plugin/plugin.gyp:npGoogleNaClPluginChrome', + '../native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPluginChrome', '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel', '../native_client/src/trusted/validator_x86/validator_x86.gyp:ncvalidate', '../native_client/src/trusted/platform_qualify/platform_qualify.gyp:platform_qual_lib', |