Revert 50667 - Add in support for internal pepper plugins into the PepperPlug...

remoting/remoting.gyp

 # Copyright (c) 2010 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
 
   'target_defaults': {
     'defines': [
     ],
     'include_dirs': [
       '..',  # Root of Chrome checkout
     ],
   },
 
   'conditions': [
+    # Chromoting Client targets
     ['OS=="linux" or OS=="mac"', {
       'targets': [
+        {
+          'target_name': 'chromoting_client_plugin',
+          'type': 'static_library',
+          'defines': [
+            'HAVE_STDINT_H',  # Required by on2_integer.h
+          ],
+          'dependencies': [
+            'chromoting_base',
+            'chromoting_client',
+            'chromoting_jingle_glue',
+            '../third_party/ppapi/ppapi.gyp:ppapi_cpp',
+            '../third_party/zlib/zlib.gyp:zlib',
+          ],
+          'sources': [
+            'client/plugin/chromoting_plugin.cc',
+            'client/plugin/chromoting_plugin.h',
+            'client/plugin/pepper_view.cc',
+            'client/plugin/pepper_view.h',
+            '../media/base/yuv_convert.cc',
+            '../media/base/yuv_convert.h',
+            '../media/base/yuv_row.h',
+            '../media/base/yuv_row_posix.cc',
+            '../media/base/yuv_row_table.cc',
+          ],
+          'conditions': [
+            ['OS=="win"', {
+              'sources': [
+                '../media/base/yuv_row_win.cc',
+              ],
+            }],
+            ['OS=="linux" and target_arch=="x64" and linux_fpic!=1', {
+              # Shared libraries need -fPIC on x86-64
+              'cflags': ['-fPIC'],
+            }],
+          ],  # end of 'conditions'
+        },  # end of target 'chromoting_client_plugin'
+
         # Simple webserver for testing chromoting client plugin.
         {
           'target_name': 'chromoting_client_test_webserver',
           'type': 'executable',
           'sources': [
             'tools/client_webserver/main.c',
           ],
-        }
-      ],  # end of target 'chromoting_client_test_webserver'
-    }],
+        },  # end of target 'chromoting_client_test_webserver'
+
+      ],  # end of Client targets
+    }],  # end of OS conditions for Client targets
 
     # TODO(hclam): Enable this target for mac.
     ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-
       'targets': [
         {
           'target_name': 'chromoting_x11_client',
           'type': 'executable',
           'dependencies': [
             'chromoting_base',
             'chromoting_client',
             'chromoting_jingle_glue',
           ],
           'link_settings': {
@@ skipping 10 matching lines @@
             'client/x11_view.h',
           ],
         },  # end of target 'chromoting_x11_client'
       ],
     }],  # end of OS conditions for x11 client
 
   ],  # end of 'conditions'
 
   'targets': [
     {
-      'target_name': 'chromoting_plugin',
-      'type': 'static_library',
-      'defines': [
-        'HAVE_STDINT_H',  # Required by on2_integer.h
-      ],
-      'dependencies': [
-        'chromoting_base',
-        'chromoting_client',
-        'chromoting_jingle_glue',
-        '../third_party/ppapi/ppapi.gyp:ppapi_c',
-        '../third_party/zlib/zlib.gyp:zlib',
-      ],
-      'sources': [
-        'client/plugin/chromoting_plugin.cc',
-        'client/plugin/chromoting_plugin.h',
-        'client/plugin/pepper_entrypoints.cc',
-        'client/plugin/pepper_entrypoints.h',
-        'client/plugin/pepper_view.cc',
-        'client/plugin/pepper_view.h',
-        '../media/base/yuv_convert.cc',
-        '../media/base/yuv_convert.h',
-        '../media/base/yuv_row.h',
-        '../media/base/yuv_row_table.cc',
-      ],
-      'conditions': [
-        ['OS=="win"', {
-          'sources': [
-            '../media/base/yuv_row_win.cc',
-          ],
-        }],
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="mac"', {
-          'sources': [
-            '../media/base/yuv_row_posix.cc',
-          ],
-        }],
-      ],  # end of 'conditions'
-    },  # end of target 'chromoting_plugin'
-
-    {
       'target_name': 'chromoting_base',
       'type': '<(library)',
       'dependencies': [
         '../gfx/gfx.gyp:*',
         '../media/media.gyp:media',
         '../third_party/protobuf2/protobuf.gyp:protobuf_lite',
         'base/protocol/chromotocol.gyp:chromotocol_proto_lib',
         'chromoting_jingle_glue',
         # TODO(hclam): Enable VP8 in the build.
         #'third_party/on2/on2.gyp:vp8',
@@ skipping 243 matching lines @@
       ],  # end of 'conditions'
     },  # end of target 'chromoting_unittests'
   ],  # end of targets
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: