Skip to content

Commit

Permalink
Candidate fix for failure on Windows to load libpeerconnection.dll.
Browse files Browse the repository at this point in the history
All platforms now pass the full path to the library.

BUG=251327

Review URL: https://chromiumcodereview.appspot.com/18358003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209679 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
tommi@chromium.org committed Jul 2, 2013
1 parent 1c08fa7 commit f9e8a6a
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions third_party/libjingle/overrides/init_webrtc.cc
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,17 @@ DestroyWebRtcMediaEngineFunction g_destroy_webrtc_media_engine = NULL;
// Returns the full or relative path to the libpeerconnection module depending
// on what platform we're on.
static base::FilePath GetLibPeerConnectionPath() {
base::FilePath path;
CHECK(PathService::Get(base::DIR_MODULE, &path));
#if defined(OS_WIN)
base::FilePath path(FILE_PATH_LITERAL("libpeerconnection.dll"));
path = path.Append(FILE_PATH_LITERAL("libpeerconnection.dll"));
#elif defined(OS_MACOSX)
// Simulate '@loader_path/Libraries'.
base::FilePath path;
CHECK(PathService::Get(base::DIR_MODULE, &path));
path = path.Append(FILE_PATH_LITERAL("Libraries"))
.Append(FILE_PATH_LITERAL("libpeerconnection.so"));
#elif defined(OS_ANDROID)
base::FilePath path;
CHECK(PathService::Get(base::DIR_MODULE, &path));
path = path.Append(FILE_PATH_LITERAL("libpeerconnection.so"));
#else
base::FilePath path;
CHECK(PathService::Get(base::DIR_MODULE, &path));
path = path.Append(FILE_PATH_LITERAL("lib"))
.Append(FILE_PATH_LITERAL("libpeerconnection.so"));
#endif
Expand Down

0 comments on commit f9e8a6a

Please sign in to comment.