diff options
| author | kjellander <kjellander@chromium.org> | 2016-03-02 03:19:30 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-02 11:20:57 +0000 |
| commit | 3b740a1e1324d7cd4d786f6aafa90dd1cb004cab (patch) | |
| tree | 30bf2e577f2a4d6c910b75815d95e029bad0b818 /third_party/libjingle | |
| parent | c41f2b9acaf4842b5d5daabc65154d4b74825e21 (diff) | |
| download | chromium_src-3b740a1e1324d7cd4d786f6aafa90dd1cb004cab.zip chromium_src-3b740a1e1324d7cd4d786f6aafa90dd1cb004cab.tar.gz chromium_src-3b740a1e1324d7cd4d786f6aafa90dd1cb004cab.tar.bz2 | |
Android: Don't make libpeerconnection a standalone library.
This should no longer be needed.
BUG=webrtc:4256
Review URL: https://codereview.chromium.org/1757803002
Cr-Commit-Position: refs/heads/master@{#378726}
Diffstat (limited to 'third_party/libjingle')
| -rw-r--r-- | third_party/libjingle/BUILD.gn | 4 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/third_party/libjingle/BUILD.gn b/third_party/libjingle/BUILD.gn index 2304fee..8aadd9c 100644 --- a/third_party/libjingle/BUILD.gn +++ b/third_party/libjingle/BUILD.gn @@ -292,8 +292,6 @@ if (enable_webrtc) { ] } - # Note: this does not support the shared library build of libpeerconnection - # as is supported in the GYP build. It's not clear what this is used for. source_set("libjingle_webrtc_common") { sources = [ "../webrtc/api/audiotrack.cc", @@ -461,8 +459,6 @@ if (enable_webrtc) { } } - # Note: this does not support the shared library build of libpeerconnection - # as is supported in the GYP build. It's not clear what this is used for. source_set("libpeerconnection") { sources = [ "../webrtc/media/engine/simulcast.cc", diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index d5c8149..1fff81d 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -497,11 +497,6 @@ '<@(libjingle_peerconnection_additional_deps)', 'libjingle_webrtc_common', ], - 'conditions': [ - ['OS=="android"', { - 'standalone_static_library': 1, - }], - ], }, # target libpeerconnection ], }], |