1 files changed, 40 insertions, 73 deletions
diff --git a/ppapi/native_client/src/trusted/plugin/plugin.gyp b/ppapi/native_client/src/trusted/plugin/plugin.gyp
index 3521409..432c4b5 100644
--- a/ppapi/native_client/src/trusted/plugin/plugin.gyp
+++ b/ppapi/native_client/src/trusted/plugin/plugin.gyp
@@ -49,81 +49,48 @@
       }],
     ],
   },
-  'targets': [],
-  'conditions': [
-    ['nacl_standalone==1', {
-      'targets': [
-        {
-          'target_name': 'ppGoogleNaClPlugin',
-          'type': 'shared_library',
+  'targets': [
+    {
+      'target_name': 'ppGoogleNaClPluginChrome',
+      'type': 'loadable_module',
+      'sources': [
+        '<@(common_sources)',
+      ],
+      'xcode_settings': {
+        'OTHER_LDFLAGS': [
+          '-Wl,-exported_symbols_list <(DEPTH)/ppapi/native_client/src/trusted/plugin/ppapi.def'
+        ],
+      },
+      'dependencies': [
+        '<(DEPTH)/media/media.gyp:shared_memory_support',
+        '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio',
+        '<(DEPTH)/native_client/src/shared/imc/imc.gyp:imc',
+        '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform',
+        '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc',
+        '<(DEPTH)/native_client/src/trusted/desc/desc.gyp:nrd_xfer',
+        '<(DEPTH)/native_client/src/trusted/nonnacl_util/nonnacl_util.gyp:nonnacl_util',
+        '<(DEPTH)/native_client/src/trusted/platform_qualify/platform_qualify.gyp:platform_qual_lib',
+        '<(DEPTH)/native_client/src/trusted/gio/gio_wrapped_desc.gyp:gio_wrapped_desc',
+        '<(DEPTH)/native_client/src/trusted/simple_service/simple_service.gyp:simple_service',
+        '<(DEPTH)/native_client/src/trusted/reverse_service/reverse_service.gyp:reverse_service',
+        '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.gyp:weak_ref',
+        '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp:nacl_ppapi_browser',
+        '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
+        '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
+      ],
+      'conditions': [
+        ['OS=="mac"', {
+          'mac_bundle': 1,
+          'product_name': 'ppGoogleNaClPluginChrome',
+          'product_extension': 'plugin',
+        }],
+        ['OS=="mac" and mac_breakpad==1', {
           'variables': {
-            'target_base': 'ppNaClPlugin',
+            # A real .dSYM is needed for dump_syms to operate on.
+            'mac_real_dsym': 1,
           },
-          'dependencies': [
-            '<(DEPTH)/media/media.gyp:shared_memory_support',
-            '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio',
-            '<(DEPTH)/native_client/src/shared/imc/imc.gyp:imc',
-            '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform',
-            '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc',
-            '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc',
-            '<(DEPTH)/native_client/src/third_party_mod/jsoncpp/jsoncpp.gyp:jsoncpp',
-            '<(DEPTH)/native_client/src/trusted/desc/desc.gyp:nrd_xfer',
-            '<(DEPTH)/native_client/src/trusted/nonnacl_util/nonnacl_util.gyp:nonnacl_util',
-            '<(DEPTH)/native_client/src/trusted/platform_qualify/platform_qualify.gyp:platform_qual_lib',
-            '<(DEPTH)/native_client/src/trusted/gio/gio_wrapped_desc.gyp:gio_wrapped_desc',
-            '<(DEPTH)/native_client/src/trusted/simple_service/simple_service.gyp:simple_service',
-            '<(DEPTH)/native_client/src/trusted/reverse_service/reverse_service.gyp:reverse_service',
-            '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.gyp:weak_ref',
-            '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp:nacl_ppapi_browser',
-            '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
-          ],
-      }],
-    }],
-    ['nacl_standalone==0', {
-      'targets': [
-        {
-          'target_name': 'ppGoogleNaClPluginChrome',
-          'type': 'loadable_module',
-          'sources': [
-            '<@(common_sources)',
-          ],
-          'xcode_settings': {
-            'OTHER_LDFLAGS': [
-                '-Wl,-exported_symbols_list <(DEPTH)/ppapi/native_client/src/trusted/plugin/ppapi.def'
-            ],
-          },
-          'dependencies': [
-            '<(DEPTH)/media/media.gyp:shared_memory_support',
-            '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio',
-            '<(DEPTH)/native_client/src/shared/imc/imc.gyp:imc',
-            '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform',
-            '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc',
-            '<(DEPTH)/native_client/src/trusted/desc/desc.gyp:nrd_xfer',
-            '<(DEPTH)/native_client/src/trusted/nonnacl_util/nonnacl_util.gyp:nonnacl_util',
-            '<(DEPTH)/native_client/src/trusted/platform_qualify/platform_qualify.gyp:platform_qual_lib',
-            '<(DEPTH)/native_client/src/trusted/gio/gio_wrapped_desc.gyp:gio_wrapped_desc',
-            '<(DEPTH)/native_client/src/trusted/simple_service/simple_service.gyp:simple_service',
-            '<(DEPTH)/native_client/src/trusted/reverse_service/reverse_service.gyp:reverse_service',
-            '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.gyp:weak_ref',
-            '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp:nacl_ppapi_browser',
-            '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
-            '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
-          ],
-          'conditions': [
-            ['OS=="mac"', {
-              'mac_bundle': 1,
-              'product_name': 'ppGoogleNaClPluginChrome',
-              'product_extension': 'plugin',
-            }],
-            ['OS=="mac" and mac_breakpad==1', {
-              'variables': {
-                # A real .dSYM is needed for dump_syms to operate on.
-                'mac_real_dsym': 1,
-              },
-            }],
-          ],
-        },
+        }],
       ],
-    }],
+    },
   ],
 }