diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | chrome/chrome_dll.gypi | 4 | ||||
| -rw-r--r-- | chrome/nacl.gypi | 1 |
3 files changed, 5 insertions, 2 deletions
@@ -8,7 +8,7 @@ vars = { "skia_revision": "636", "chromium_git": "http://git.chromium.org/git", "swig_revision": "69281", - "nacl_revision": "4020", + "nacl_revision": "4028", "libjingle_revision": "50", "libvpx_revision": "65287", "ffmpeg_revision": "69487", 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', |