diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-19 04:53:59 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-19 04:53:59 +0000 |
| commit | 22a8c00a79efd03fccc3d13918a39cc6bec05710 (patch) | |
| tree | 942744faca6d15e16a588a5b0215a77de25ee3ca /chrome | |
| parent | ca7e7364bd713d29e89b224935913b3f59ea5030 (diff) | |
| download | chromium_src-22a8c00a79efd03fccc3d13918a39cc6bec05710.zip chromium_src-22a8c00a79efd03fccc3d13918a39cc6bec05710.tar.gz chromium_src-22a8c00a79efd03fccc3d13918a39cc6bec05710.tar.bz2 | |
Revert 69673.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69674 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, 1 insertions, 4 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index b95d02e..267382f 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -469,9 +469,7 @@ }, { 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins', - 'files': [ - '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.plugin', - ], + 'files': [], 'conditions': [ [ 'branding == "Chrome"', { 'files': [ diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi index 5947d6a..f3a179d 100644 --- a/chrome/nacl.gypi +++ b/chrome/nacl.gypi @@ -71,7 +71,6 @@ '../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', |