Pepper: Remove trusted plugin loadable module.

ppapi/native_client/src/trusted/plugin/plugin.gyp

Index: ppapi/native_client/src/trusted/plugin/plugin.gyp
diff --git a/ppapi/native_client/src/trusted/plugin/plugin.gyp b/ppapi/native_client/src/trusted/plugin/plugin.gyp
index 343883d24743a9ee2882bb76e1fa91b69581e26c..eb44612cf6db286935a4a8d044bf2b70dfd06edb 100644
--- a/ppapi/native_client/src/trusted/plugin/plugin.gyp
+++ b/ppapi/native_client/src/trusted/plugin/plugin.gyp
@@ -7,57 +7,13 @@
   'includes': [
     'plugin.gypi',
   ],
-  'target_defaults': {
-    'variables': {
-      'target_base': 'none',
-    },
-    'target_conditions': [
-      ['target_base=="ppNaClPlugin"', {
-        'sources': [
-          '<@(common_sources)',
-        ],
-        'xcode_settings': {
-          'WARNING_CFLAGS!': [
-            # TODO(bradnelson): remove -pedantic when --std=c++98 in common.gypi
-            '-pedantic',
-          ],
-          'WARNING_CFLAGS': [
-            '-Wno-deprecated',
-            '-Wno-deprecated-declarations',
-          ],
-        },
-        'conditions': [
-          ['OS=="win"', {
-            'sources': [
-              'win/nacl_plugin.rc',
-            ],
-            'msvs_settings': {
-              'VCCLCompilerTool': {
-                'ExceptionHandling': '2',  # /EHsc
-              },
-              'VCLinkerTool': {
-                'AdditionalLibraryDirectories': [
-                   '$(OutDir)/lib',
-                ],
-              },
-            },
-          }],
-        ],
-      }],
-    ],
-  },
   'targets': [
     {
       'target_name': 'ppGoogleNaClPluginChrome',

[Mark Seaborn, 2014/07/28 20:28:37]

How about renaming this?

 * camelCase isn't the usual Gyp style for targets.

 * There might still be packaging scripts that refer to
ppGoogleNaClPluginChrome.{dll,so,dylib}, e.g. in the Chrome OS packaging scripts
or in Linux distros' packaging scripts.  They might accidentally pick up the new
ppGoogleNaClPluginChrome and either go wrong or just waste space.  (Maybe that's
not very likely if this target becomes ppGoogleNaClPluginChrome.a, but it might
stay as ppGoogleNaClPluginChrome.so in a modules/components build.)

[teravest, 2014/07/28 22:04:22]

Sounds reasonable. Renamed to nacl_trusted_plugin

-      'type': 'loadable_module',
+      'type': 'static_library',
       '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',
@@ -65,26 +21,14 @@
         '<(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/nonnacl_util/nonnacl_util.gyp:sel_ldr_launcher_base',
         '<(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/ppapi.gyp:ppapi_cpp',
-      ],
-      '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,
-          },
-        }],
+        '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp_objects',
+        '<(DEPTH)/ppapi/ppapi.gyp:ppapi_internal_module',
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [4267, ],