Statically link VPX into the Host Plugin.

BUG=
TEST=Host plugin loads and doesn't mysteriously crash trying to call into VPX when a connection is first made.


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=87534

Review URL: http://codereview.chromium.org/7065026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87678 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 25 insertions, 2 deletions

diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index c0d8a57..156f29d 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -67,6 +67,7 @@
             'remoting_base',
             'remoting_client',
             'remoting_jingle_glue',
+            '../media/media.gyp:media',
           ],
           'link_settings': {
             'libraries': [
@@ -99,7 +100,7 @@
         'remoting_base',
         'remoting_client',
         'remoting_jingle_glue',
-        '../media/media.gyp:yuv_convert',
+        '../media/media.gyp:media',
         '../ppapi/ppapi.gyp:ppapi_cpp_objects',
 
         # TODO(sergeyu): This is a hack: plugin should not depend on
@@ -142,6 +143,7 @@
         'remoting_base',
         'remoting_host',
         'remoting_jingle_glue',
+        '../third_party/libvpx/libvpx.gyp:libvpx_lib',
         '../third_party/npapi/npapi.gyp:npapi',
       ],
       'sources': [
@@ -156,6 +158,16 @@
             'INFOPLIST_PREPROCESS': 'YES',
             'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'HOST_PLUGIN_MIME_TYPE=<(host_plugin_mime_type)',
             'WRAPPER_EXTENSION': '<(plugin_extension)',
+            'OTHER_LDFLAGS': [ # TODO(wez): Remove if libvpx gets PIC-fixed.
+              # This is needed because at least part of libvpx is not
+              # PIC-friendly, thus we need to instruct the linker to allow
+              # relocations for read-only segments for this target to be able
+              # to generated the shared library on Mac.
+              #
+              # This hack is cribbed from ffmpeg.gyp, and makes someone called
+              # Mark sad, so at least I'm not alone.
+              '-Wl,-read_only_relocs,suppress',
+            ],
           },
           # TODO(mark): Come up with a fancier way to do this.  It should
           # only be necessary to list framework-Info.plist once, not the
@@ -167,6 +179,15 @@
             'host/host_plugin-Info.plist',
           ],
         }],
+        ['OS=="win"', { # TODO(wez): Remove if libvpx is built by MSVC.
+          'msvs_settings': {
+            'VCLinkerTool': {
+              'AdditionalOptions!': [
+                '/safeseh',
+              ],
+            },
+          },
+        }],
       ],
     },  # end of target 'remoting_host_plugin'
     {
@@ -212,10 +233,10 @@
       'dependencies': [
         '../base/base.gyp:base',
         '../ui/ui.gyp:ui_gfx',
-        '../media/media.gyp:media',
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
         '../third_party/libvpx/libvpx.gyp:libvpx_include',
         '../third_party/zlib/zlib.gyp:zlib',
+        '../media/media.gyp:yuv_convert',
         'remoting_jingle_glue',
         'proto/chromotocol.gyp:chromotocol_proto_lib',
         'proto/trace.gyp:trace_proto_lib',
@@ -412,6 +433,7 @@
         'remoting_jingle_glue',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
+        '../media/media.gyp:media',
       ],
       'sources': [
         'host/capturer_fake_ascii.cc',
@@ -612,6 +634,7 @@
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
+        '../media/media.gyp:media',
         '../ui/ui.gyp:ui_gfx',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',