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

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

Issue 17647002: Fix check_perms for r208246 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
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
« no previous file with comments | « third_party/libjingle/overrides/init_webrtc.h ('k') | third_party/libjingle/overrides/initialize_module.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libjingle/overrides/init_webrtc.cc
===================================================================
--- third_party/libjingle/overrides/init_webrtc.cc (revision 208299)
+++ third_party/libjingle/overrides/init_webrtc.cc (working copy)
@@ -61,6 +61,10 @@
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));
@@ -94,7 +98,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)
+#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
&Allocate, &Dellocate,
#endif
logging::GetLogMessageHandler(),
« no previous file with comments | « third_party/libjingle/overrides/init_webrtc.h ('k') | third_party/libjingle/overrides/initialize_module.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698