| Index: chrome/app/chrome_main_delegate.cc
|
| diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
|
| index a1eaf52fb5ad84d823e1e74629451b29df8f7dcd..2989f679faeb4bd7d25ecf485f1d611713e443d8 100644
|
| --- a/chrome/app/chrome_main_delegate.cc
|
| +++ b/chrome/app/chrome_main_delegate.cc
|
| @@ -636,6 +636,9 @@ void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) {
|
| int ChromeMainDelegate::RunProcess(
|
| const std::string& process_type,
|
| const content::MainFunctionParams& main_function_params) {
|
| +#if !defined(OS_ANDROID)
|
| + // Android doesn't support "service", so no ServiceProcessMain, and arraysize
|
| + // doesn't support empty array. So we disable the block entirely for Android.
|
| static const MainFunction kMainFunctions[] = {
|
| { switches::kServiceProcess, ServiceProcessMain },
|
| #if defined(OS_MACOSX)
|
| @@ -651,6 +654,7 @@ int ChromeMainDelegate::RunProcess(
|
| if (process_type == kMainFunctions[i].name)
|
| return kMainFunctions[i].function(main_function_params);
|
| }
|
| +#endif
|
|
|
| return -1;
|
| }
|
|
|