diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-13 06:56:54 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-13 06:56:54 +0000 |
| commit | 0da144f929ce08a5070e02812220916bbe8afb02 (patch) | |
| tree | 658189974c30e54618e11f35f11295f6c00baa7b | |
| parent | 29eb566d99142b3ddefbf9eca8051fdae267b5dd (diff) | |
| download | chromium_src-0da144f929ce08a5070e02812220916bbe8afb02.zip chromium_src-0da144f929ce08a5070e02812220916bbe8afb02.tar.gz chromium_src-0da144f929ce08a5070e02812220916bbe8afb02.tar.bz2 | |
Merge 209679 "Candidate fix for failure on Windows to load libpe..."
> Candidate fix for failure on Windows to load libpeerconnection.dll.
> All platforms now pass the full path to the library.
>
> BUG=251327
>
> Review URL: https://chromiumcodereview.appspot.com/18358003
TBR=tommi@chromium.org
Review URL: https://codereview.chromium.org/19123002
git-svn-id: svn://svn.chromium.org/chrome/branches/1547/src@211554 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | third_party/libjingle/overrides/init_webrtc.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/third_party/libjingle/overrides/init_webrtc.cc b/third_party/libjingle/overrides/init_webrtc.cc index 5436345..cc0ad5f 100644 --- a/third_party/libjingle/overrides/init_webrtc.cc +++ b/third_party/libjingle/overrides/init_webrtc.cc @@ -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 |