Shell: Make a separate binary for child processes.

shell/android/main.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "shell/android/main.h"
 
 #include "base/android/fifo_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
@@ skipping 28 matching lines @@
 namespace {
 
 // Tag for logging.
 const char kLogTag[] = "chromium";
 
 // Command line argument for the communication fifo.
 const char kFifoPath[] = "fifo-path";
 
 class MojoShellRunner : public base::DelegateSimpleThread::Delegate {
  public:
-  MojoShellRunner(const std::vector<std::string>& parameters)
-      : parameters_(parameters) {}
+  MojoShellRunner(const base::FilePath& mojo_shell_path,
+                  const base::FilePath& mojo_shell_child_path,
+                  const std::vector<std::string>& parameters)
+      : mojo_shell_path_(mojo_shell_path),
+        mojo_shell_child_path_(mojo_shell_child_path),
+        parameters_(parameters) {}
   ~MojoShellRunner() override {}
 
  private:
   void Run() override;
 
-  std::vector<std::string> parameters_;
+  const base::FilePath mojo_shell_path_;
+  const base::FilePath mojo_shell_child_path_;
+  const std::vector<std::string> parameters_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoShellRunner);
 };
 
 LazyInstance<scoped_ptr<base::MessageLoop>> g_java_message_loop =
     LAZY_INSTANCE_INITIALIZER;
 
 LazyInstance<scoped_ptr<Context>> g_context = LAZY_INSTANCE_INITIALIZER;
 
 LazyInstance<scoped_ptr<MojoShellRunner>> g_shell_runner =
@@ skipping 31 matching lines @@
   g_shell_thread.Pointer()->reset();
   Java_ShellMain_finishActivity(base::android::AttachCurrentThread(),
                                 g_main_activiy.Get().obj());
   exit(0);
 }
 
 void MojoShellRunner::Run() {
   base::MessageLoop loop(common::MessagePumpMojo::Create());
   Context* context = g_context.Pointer()->get();
   ConfigureAndroidServices(context);
-  context->Init();
+  context->InitWithPaths(mojo_shell_path_, mojo_shell_child_path_);
 
-  for (auto& args : parameters_)
+  for (const auto& args : parameters_)
     ApplyApplicationArgs(context, args);
 
   RunCommandLineApps(context);
   loop.Run();
 
   g_java_message_loop.Pointer()->get()->PostTask(FROM_HERE,
                                                  base::Bind(&QuitShellThread));
 }
 
 // Initialize stdout redirection if the command line switch is present.
@@ skipping 14 matching lines @@
   CHECK(dup2(STDOUT_FILENO, STDERR_FILENO) != -1)
       << "Unable to redirect stderr to stdout.";
 }
 
 }  // namespace
 
 static void Init(JNIEnv* env,
                  jclass clazz,
                  jobject activity,
                  jstring mojo_shell_path,
+                 jstring mojo_shell_child_path,
                  jobjectArray jparameters,
                  jstring j_local_apps_directory,
                  jstring j_tmp_dir) {
   g_main_activiy.Get().Reset(env, activity);
 
   // Setting the TMPDIR environment variable so that applications can use it.
   // TODO(qsr) We will need our subprocesses to inherit this.
   int return_value =
       setenv("TMPDIR",
              base::android::ConvertJavaStringToUTF8(env, j_tmp_dir).c_str(), 1);
   DCHECK_EQ(return_value, 0);
 
   base::android::ScopedJavaLocalRef<jobject> scoped_activity(env, activity);
   base::android::InitApplicationContext(env, scoped_activity);
 
   std::vector<std::string> parameters;
   parameters.push_back(
       base::android::ConvertJavaStringToUTF8(env, mojo_shell_path));
   base::android::AppendJavaStringArrayToStringVector(env, jparameters,
                                                      &parameters);
   base::CommandLine::Init(0, nullptr);
   base::CommandLine::ForCurrentProcess()->InitFromArgv(parameters);
-  g_shell_runner.Get().reset(new MojoShellRunner(parameters));
+  g_shell_runner.Get().reset(new MojoShellRunner(
+      base::FilePath(
+          base::android::ConvertJavaStringToUTF8(env, mojo_shell_path)),
+      base::FilePath(
+          base::android::ConvertJavaStringToUTF8(env, mojo_shell_child_path)),
+      parameters));
 
   InitializeLogging();
 
   InitializeRedirection();
 
   // We want ~MessageLoop to happen prior to ~Context. Initializing
   // LazyInstances is akin to stack-allocating objects; their destructors
   // will be invoked first-in-last-out.
   Context* shell_context = new Context();
   shell_context->SetShellFileRoot(base::FilePath(
@@ skipping 29 matching lines @@
   base::CommandLine::ForCurrentProcess()->AppendArg(
       base::android::ConvertJavaStringToUTF8(env, jurl));
 }
 
 bool RegisterShellMain(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace shell
 }  // namespace mojo
+
+// TODO(vtl): We need a main(), even though it should never be called.

[qsr, 2015/04/08 09:27:44]

If we do not need to run this anymore, I'll need to redefine this as a
shared_library instead of an executable, and we won't need this main anymore.

+int main(int argc, char** argv) {
+  NOTREACHED();
+  return 1;
+}