Switch back to building the Native Client plugin on all platforms now that...

chrome/nacl.gypi

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'target_defaults': {
     'variables': {
       'nacl_target': 0,
     },
     'target_conditions': [
@@ skipping 53 matching lines @@
       'dependencies': [
         # TODO(gregoryd): chrome_resources and chrome_strings could be
         # shared with the 64-bit target, but it does not work due to a gyp
         #issue
         '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',
         '../native_client/src/trusted/platform_qualify/platform_qualify.gyp:platform_qual_lib',
       ],
       'direct_dependent_settings': {
         'defines': [
           'NACL_BLOCK_SHIFT=5',
           'NACL_BLOCK_SIZE=32',
           '<@(nacl_defines)',
         ],
       },
-      'conditions': [
-        ['OS=="mac"', {
-          'dependencies': [
-            # TODO(abarth): We should build ppGoogleNaClPluginChrome on all platforms.
-            '../native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPluginChrome',
-          ],
-        }]
-      ],
     },
   ],
   'conditions': [
     ['OS=="win"', {
       'targets': [
         {
           'target_name': 'nacl_win64',
           'type': '<(library)',
           'msvs_guid': '14135464-9FB9-42E3-99D8-791116FA1204',
           'variables': {
@@ skipping 27 matching lines @@
               'NACL_BLOCK_SHIFT=5',
               'NACL_BLOCK_SIZE=32',
               '<@(nacl_defines)',
             ],
           },
         },
       ],
     }],
   ],
 }