Skip to content

Commit

Permalink
remoting_host_plugin to link with libvpx built from source
Browse files Browse the repository at this point in the history
Remove the dependency on libvpx_lib but link to libvpx instead.
This gets rid of linking to a pre-built library.

BUG=None
TEST=None

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90866 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
hclam@chromium.org committed Jun 28, 2011
1 parent e131f48 commit 0573d85
Showing 1 changed file with 1 addition and 20 deletions.
21 changes: 1 addition & 20 deletions remoting/remoting.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
'remoting_base',
'remoting_host',
'remoting_jingle_glue',
'../third_party/libvpx/libvpx.gyp:libvpx_lib',
'../third_party/libvpx/libvpx.gyp:libvpx',
'../third_party/npapi/npapi.gyp:npapi',
],
'sources': [
Expand All @@ -156,16 +156,6 @@
'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
Expand All @@ -178,15 +168,6 @@
'host/plugin/host_plugin-Info.plist',
],
}],
['OS=="win"', { # TODO(wez): Remove if libvpx is built by MSVC.
'msvs_settings': {
'VCLinkerTool': {
'AdditionalOptions!': [
'/safeseh',
],
},
},
}],
['OS!="win"', {
'sources!': [
'host/plugin/host_plugin.def',
Expand Down

0 comments on commit 0573d85

Please sign in to comment.