zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove references to libpeerconnection.

Browse Source 
What used to be the libpeerconnection library is now compiled
statically into the Chromium binary, so clean up references it.

BUG=chromium:482123
TBR=tommi@webrtc.org

Review URL: https://codereview.webrtc.org/1399513002 .

Cr-Commit-Position: refs/heads/master@{#10216}
This commit is contained in:
Henrik Kjellander
2015-10-08 14:40:51 +02:00
parent 87f83a9a27
commit 6ffc3309de
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
talk/app/webrtc/javatests/libjingle_peerconnection_java_unittest.sh
View File

@ -46,7 +46,7 @@ export CLASSPATH=`pwd`/junit-4.11.jar
CLASSPATH=$CLASSPATH:`pwd`/libjingle_peerconnection_test.jar
CLASSPATH=$CLASSPATH:`pwd`/libjingle_peerconnection.jar
# This sets java.library.path so our lookup of libpeerconnection.so works.
# This sets java.library.path so lookup of libjingle_peerconnection_so.so works.
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`:`pwd`/lib:`pwd`/lib.target
# The RHS value is replaced by the build action that copies this script to

4
webrtc/webrtc.gyp
View File

@ -119,8 +119,8 @@
'rtc_event_log',
],
'conditions': [
# TODO(andresp): Chromium libpeerconnection should link directly with
# this and no if conditions should be needed on webrtc build files.
# TODO(andresp): Chromium should link directly with this and no if
# conditions should be needed on webrtc build files.
['build_with_chromium==1', {
'dependencies': [
'<(webrtc_root)/modules/modules.gyp:video_capture',