Index: content/browser/browser_main_loop.cc |
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc |
index 0ecec70c743451490ac610603e5261e9f6ea045d..1aed2d2c55828edca69269a153feb64afddb547c 100644 |
--- a/content/browser/browser_main_loop.cc |
+++ b/content/browser/browser_main_loop.cc |
@@ -85,7 +85,7 @@ using content::TraceControllerImpl; |
namespace { |
-#if defined(OS_POSIX) && !defined(OS_MACOSX) |
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) |
void SetupSandbox(const CommandLine& parsed_command_line) { |
// TODO(evanm): move this into SandboxWrapper; I'm just trying to move this |
// code en masse out of chrome_main for now. |
@@ -266,7 +266,7 @@ void BrowserMainLoop::EarlyInitialization() { |
} |
#endif // !defined(USE_OPENSSL) |
-#if defined(OS_POSIX) && !defined(OS_MACOSX) |
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) |
SetupSandbox(parsed_command_line_); |
#endif |
@@ -638,6 +638,9 @@ void BrowserMainLoop::MainMessageLoopRun() { |
#if defined(OS_MACOSX) |
MessageLoopForUI::current()->Run(); |
+#elif defined(OS_ANDROID) |
+ // Android's main message loop is the Java message loop. |
+ NOTREACHED(); |
#else |
MessageLoopForUI::current()->RunWithDispatcher(NULL); |
#endif |