Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4326)

Unified Diff: chrome/nacl.gypi

Issue 5986018: Switch back to building the Native Client plugin on all platforms now that... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/nacl.gypi
===================================================================
--- chrome/nacl.gypi (revision 70583)
+++ chrome/nacl.gypi (working copy)
@@ -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',
@@ -82,14 +83,6 @@
'<@(nacl_defines)',
],
},
- 'conditions': [
- ['OS=="mac"', {
- 'dependencies': [
- # TODO(abarth): We should build ppGoogleNaClPluginChrome on all platforms.
- '../native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPluginChrome',
- ],
- }]
- ],
},
],
'conditions': [
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698