Move plugin/srpc contents to the more appropriately named plugin/common....

src/trusted/plugin/build.scons

 # -*- python -*-
 # Copyright 2008, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
@@ skipping 70 matching lines @@
     )
 
 if env.Bit('windows'):
     env.Append(
         CCFLAGS = ['/EHsc',],
         CPPDEFINES = ['XP_WIN', 'WIN32', '_WINDOWS'],
     )
     env.Tool('atlmfc_vc80')
 
 # Both the NPAPI and PPAPI plugins depend upon the code that is in the
-# srpc subdirectory and on a large set of libraries.
+# top (plugin) directory and on a large set of libraries.
 common_inputs = [
     # TODO: we should put a scons file in src/third_party_mod/nacl_plugin
     #       which exports a library which is then linked in.
     #       Currently this results inlink time symbol clashes
     # generic URL-origin / same-domain handling
     'origin.cc',
     # Portable plugin code
-    'srpc/browser_interface.cc',
-    'srpc/connected_socket.cc',
-    'srpc/desc_based_handle.cc',
-    'srpc/method_map.cc',
-    'srpc/nexe_arch.cc',
-    'srpc/plugin.cc',
-    'srpc/portable_handle.cc',
-    'srpc/scriptable_handle.cc',
-    'srpc/service_runtime.cc',
-    'srpc/shared_memory.cc',
-    'srpc/socket_address.cc',
-    'srpc/srpc_client.cc',
-    'srpc/srt_socket.cc',
-    'srpc/stream_shm_buffer.cc',
-    'srpc/string_encoding.cc',
-    'srpc/utility.cc',
+    'browser_interface.cc',
+    'connected_socket.cc',
+    'desc_based_handle.cc',
+    'method_map.cc',
+    'nexe_arch.cc',
+    'plugin.cc',
+    'portable_handle.cc',
+    'scriptable_handle.cc',
+    'service_runtime.cc',
+    'shared_memory.cc',
+    'socket_address.cc',
+    'srpc_client.cc',
+    'srt_socket.cc',
+    'stream_shm_buffer.cc',
+    'string_encoding.cc',
+    'utility.cc',
 ]
 
 common_objs = env.ComponentObject(common_inputs)
 
 # The common libraries are those used by both the NPAPI and PPAPI plugins.
 # They and the NPAPI/PPAPI specific libraries must come before OS libraries,
 # because they may generate references that are resolved by the OS libraries.
 # E.g., libplatform.a contains references to symbols from libcrypto.so.
 common_libs = [
     'nonnacl_util',
@@ skipping 116 matching lines @@
   nptest_env.AddNodeToTestSuite(node, ['small_tests'], 'run_plugin_unittest')
 
 
 # This test fails to link in our ARM cross-compile environment because
 # the toolchain tarball lacks libraries, specifically libSM.so.6.
 if env['TARGET_ARCHITECTURE'] != 'arm':
   test_env = env.Clone()
   test_env.FilterOut(LINKFLAGS=['-bundle'])
   string_encoding_test = test_env.ComponentProgram(
       'string_encoding_test',
-      ['srpc/string_encoding_test.cc',
-       env.ComponentObject('srpc/string_encoding_for_test',
-                           'srpc/string_encoding.cc')],
+      ['string_encoding_test.cc',
+       env.ComponentObject('string_encoding_for_test',
+                           'string_encoding.cc')],
       EXTRA_LIBS=['platform', 'gio'] + os_libs)
   node = env.CommandTest('string_encoding_test.out',
                          command=[string_encoding_test])
   env.AddNodeToTestSuite(node, ['small_tests'], 'run_string_encoding_test')
 
 
 # The PPAPI (Pepper v2) plugin is used in Chrome.  We build a shared library
 # with this build script to allow easier build testing.  The actual PPAPI
 # integration uses the same sources, but is part of the Chrome build through
 # gyp.
@@ skipping 18 matching lines @@
 
 if ppapi_env.Bit('linux') and not ppapi_env.Bit('chrome'):
   ppapi_plugin = ppapi_env.ComponentLibrary(ppNaClPlugin,
                                             common_objs + ppapi_inputs,
                                             no_import_lib=True)
 
   # we need this to build the plugin, so register it here
   ppapi_env.AddPluginPrerequisite([ppapi_plugin[0]])
 
 # TODO(polina,sehr): add a test for the PPAPI plugin.