| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "mojo/runner/android/main.h" | 5 #include "mojo/runner/android/main.h" |
| 6 | 6 |
| 7 #include "base/android/fifo_utils.h" | 7 #include "base/android/fifo_utils.h" |
| 8 #include "base/android/jni_android.h" | 8 #include "base/android/jni_android.h" |
| 9 #include "base/android/jni_array.h" | 9 #include "base/android/jni_array.h" |
| 10 #include "base/android/jni_string.h" | 10 #include "base/android/jni_string.h" |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 const JavaParamRef<jstring>& j_tmp_dir) { | 108 const JavaParamRef<jstring>& j_tmp_dir) { |
| 109 g_main_activiy.Get().Reset(env, activity); | 109 g_main_activiy.Get().Reset(env, activity); |
| 110 | 110 |
| 111 // Setting the TMPDIR environment variable so that applications can use it. | 111 // Setting the TMPDIR environment variable so that applications can use it. |
| 112 // TODO(qsr) We will need our subprocesses to inherit this. | 112 // TODO(qsr) We will need our subprocesses to inherit this. |
| 113 int return_value = | 113 int return_value = |
| 114 setenv("TMPDIR", | 114 setenv("TMPDIR", |
| 115 base::android::ConvertJavaStringToUTF8(env, j_tmp_dir).c_str(), 1); | 115 base::android::ConvertJavaStringToUTF8(env, j_tmp_dir).c_str(), 1); |
| 116 DCHECK_EQ(return_value, 0); | 116 DCHECK_EQ(return_value, 0); |
| 117 | 117 |
| 118 base::android::InitApplicationContext(env, activity); | |
| 119 | |
| 120 std::vector<std::string> parameters; | 118 std::vector<std::string> parameters; |
| 121 parameters.push_back( | 119 parameters.push_back( |
| 122 base::android::ConvertJavaStringToUTF8(env, mojo_shell_path)); | 120 base::android::ConvertJavaStringToUTF8(env, mojo_shell_path)); |
| 123 base::android::AppendJavaStringArrayToStringVector(env, jparameters, | 121 base::android::AppendJavaStringArrayToStringVector(env, jparameters, |
| 124 ¶meters); | 122 ¶meters); |
| 125 base::CommandLine::Init(0, nullptr); | 123 base::CommandLine::Init(0, nullptr); |
| 126 base::CommandLine::ForCurrentProcess()->InitFromArgv(parameters); | 124 base::CommandLine::ForCurrentProcess()->InitFromArgv(parameters); |
| 127 | 125 |
| 128 InitializeLogging(); | 126 InitializeLogging(); |
| 129 mojo::runner::WaitForDebuggerIfNecessary(); | 127 mojo::runner::WaitForDebuggerIfNecessary(); |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 188 base::AtExitManager at_exit; | 186 base::AtExitManager at_exit; |
| 189 base::CommandLine::Init(argc, argv); | 187 base::CommandLine::Init(argc, argv); |
| 190 | 188 |
| 191 #if !defined(OFFICIAL_BUILD) | 189 #if !defined(OFFICIAL_BUILD) |
| 192 base::debug::EnableInProcessStackDumping(); | 190 base::debug::EnableInProcessStackDumping(); |
| 193 #endif | 191 #endif |
| 194 | 192 |
| 195 mojo::runner::InitializeLogging(); | 193 mojo::runner::InitializeLogging(); |
| 196 return mojo::runner::ChildProcessMain(); | 194 return mojo::runner::ChildProcessMain(); |
| 197 } | 195 } |
| OLD | NEW |