diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-28 23:52:00 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-28 23:52:00 +0000 |
| commit | 193abef9081e531b57b4e60c8d4d2c5376d0febb (patch) | |
| tree | f9b2f9a390f7e675285e23057883d24eb3b99bb0 /remoting | |
| parent | 6783bddcbaa24d888ce636ebb63625cfe49938ab (diff) | |
| download | chromium_src-193abef9081e531b57b4e60c8d4d2c5376d0febb.zip chromium_src-193abef9081e531b57b4e60c8d4d2c5376d0febb.tar.gz chromium_src-193abef9081e531b57b4e60c8d4d2c5376d0febb.tar.bz2 | |
Resubmit "remoting_host_plugin to link with libvpx built from source"
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/7253060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90883 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/remoting.gyp | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 075aa98..579cfec 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -134,7 +134,6 @@ 'remoting_base', 'remoting_host', 'remoting_jingle_glue', - '../third_party/libvpx/libvpx.gyp:libvpx_lib', '../third_party/npapi/npapi.gyp:npapi', ], 'sources': [ @@ -156,16 +155,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 @@ -178,21 +167,21 @@ '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', 'host/plugin/host_plugin.rc', ], }], + ['target_arch=="arm"', { + 'dependencies': [ + '../third_party/libvpx/libvpx.gyp:libvpx_lib', + ], + }, { + 'dependencies': [ + '../third_party/libvpx/libvpx.gyp:libvpx', + ], + }], ], }, # end of target 'remoting_host_plugin' { |