Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(289)

Unified Diff: trunk/src/third_party/libjingle/overrides/init_webrtc.cc

Issue 17573017: Revert 208246 "Support using loadable module for libpeerconnecti..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/third_party/libjingle/overrides/init_webrtc.cc
===================================================================
--- trunk/src/third_party/libjingle/overrides/init_webrtc.cc (revision 208284)
+++ trunk/src/third_party/libjingle/overrides/init_webrtc.cc (working copy)
@@ -61,10 +61,6 @@
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));
@@ -98,7 +94,7 @@
// PS: This function is actually implemented in allocator_proxy.cc with the
// new/delete overrides.
return initialize_module(*CommandLine::ForCurrentProcess(),
-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if !defined(OS_MACOSX)
&Allocate, &Dellocate,
#endif
logging::GetLogMessageHandler(),

Powered by Google App Engine
This is Rietveld 408576698