summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-04 03:36:12 +0000
committersehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-04 03:36:12 +0000
commitf7b6acb098a9ab434c19a837672406cc8a5cdab2 (patch)
tree0ca63753ec7bf0109a892d86c36acdce22946e4b
parent2fc51e5b5a5fd05d464ff605dfa46b15d8b0c003 (diff)
downloadchromium_src-f7b6acb098a9ab434c19a837672406cc8a5cdab2.zip
chromium_src-f7b6acb098a9ab434c19a837672406cc8a5cdab2.tar.gz
chromium_src-f7b6acb098a9ab434c19a837672406cc8a5cdab2.tar.bz2
Try again to remove NaCl NPAPI plugin hooks from the gyp files.
BUG=none TEST=none Review URL: http://codereview.chromium.org/6250150 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73757 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--chrome/nacl.gypi3
2 files changed, 1 insertions, 4 deletions
diff --git a/DEPS b/DEPS
index cc052dc..89e6fef 100644
--- a/DEPS
+++ b/DEPS
@@ -7,7 +7,7 @@ vars = {
"webkit_revision": "77544",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281",
- "nacl_revision": "4241",
+ "nacl_revision": "4270",
"libjingle_revision": "50",
"libvpx_revision": "65287",
"ffmpeg_revision": "71842",
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi
index 5947d6a..f125393 100644
--- a/chrome/nacl.gypi
+++ b/chrome/nacl.gypi
@@ -68,9 +68,7 @@
'chrome_resources',
'chrome_strings',
'common',
- '../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',
@@ -102,7 +100,6 @@
'chrome_resources',
'chrome_strings',
'common_nacl_win64',
- '../native_client/src/trusted/plugin/plugin.gyp:npGoogleNaClPluginChrome64',
'../native_client/src/trusted/service_runtime/service_runtime.gyp:sel64',
'../native_client/src/trusted/platform_qualify/platform_qualify.gyp:platform_qual_lib64',
],