From 6ffc3309dee47b31ba118e41acc89a258c754c33 Mon Sep 17 00:00:00 2001 From: Henrik Kjellander Date: Thu, 8 Oct 2015 14:40:51 +0200 Subject: [PATCH] Remove references to libpeerconnection. 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} --- .../javatests/libjingle_peerconnection_java_unittest.sh | 2 +- webrtc/webrtc.gyp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/talk/app/webrtc/javatests/libjingle_peerconnection_java_unittest.sh b/talk/app/webrtc/javatests/libjingle_peerconnection_java_unittest.sh index 91b34f72d0..d49fd00dc3 100755 --- a/talk/app/webrtc/javatests/libjingle_peerconnection_java_unittest.sh +++ b/talk/app/webrtc/javatests/libjingle_peerconnection_java_unittest.sh @@ -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 diff --git a/webrtc/webrtc.gyp b/webrtc/webrtc.gyp index 13d88b3a14..c9b3ab52db 100644 --- a/webrtc/webrtc.gyp +++ b/webrtc/webrtc.gyp @@ -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',