diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-06 04:28:30 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-06 04:28:30 +0000 |
| commit | 71e3e733d28d2968ec2a37f560f90542dd7aa47a (patch) | |
| tree | 988d7f99b9ce8f842464694212ea6daf0656e0f4 | |
| parent | 27a112c2e8c464ddd4aed5e1f425204bb3f96d54 (diff) | |
| download | chromium_src-71e3e733d28d2968ec2a37f560f90542dd7aa47a.zip chromium_src-71e3e733d28d2968ec2a37f560f90542dd7aa47a.tar.gz chromium_src-71e3e733d28d2968ec2a37f560f90542dd7aa47a.tar.bz2 | |
Switch back to building the Native Client plugin on all platforms now that
we've resolved the Windows build issue.
TBR=noelallen
Review URL: http://codereview.chromium.org/5986018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70593 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/nacl.gypi | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi index 2b7e494..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', @@ -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': [ |