| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 package org.chromium.content.app; | 5 package org.chromium.content.app; |
| 6 | 6 |
| 7 import android.app.Service; | 7 import android.app.Service; |
| 8 import android.content.Context; | 8 import android.content.Context; |
| 9 import android.content.Intent; | 9 import android.content.Intent; |
| 10 import android.graphics.SurfaceTexture; | 10 import android.graphics.SurfaceTexture; |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 if (mLinkerParams != null) { | 134 if (mLinkerParams != null) { |
| 135 if (mLinkerParams.mWaitForSharedRelro) | 135 if (mLinkerParams.mWaitForSharedRelro) |
| 136 Linker.initServiceProcess(mLinkerParams.mBaseLoa
dAddress); | 136 Linker.initServiceProcess(mLinkerParams.mBaseLoa
dAddress); |
| 137 else | 137 else |
| 138 Linker.disableSharedRelros(); | 138 Linker.disableSharedRelros(); |
| 139 | 139 |
| 140 Linker.setTestRunnerClassName(mLinkerParams.mTestRun
nerClassName); | 140 Linker.setTestRunnerClassName(mLinkerParams.mTestRun
nerClassName); |
| 141 } | 141 } |
| 142 } | 142 } |
| 143 try { | 143 try { |
| 144 LibraryLoader.loadNow(); | 144 LibraryLoader.loadNow(getApplicationContext(), false); |
| 145 } catch (ProcessInitException e) { | 145 } catch (ProcessInitException e) { |
| 146 Log.e(TAG, "Failed to load native library, exiting child
process", e); | 146 Log.e(TAG, "Failed to load native library, exiting child
process", e); |
| 147 System.exit(-1); | 147 System.exit(-1); |
| 148 } | 148 } |
| 149 synchronized (mMainThread) { | 149 synchronized (mMainThread) { |
| 150 while (mCommandLineParams == null) { | 150 while (mCommandLineParams == null) { |
| 151 mMainThread.wait(); | 151 mMainThread.wait(); |
| 152 } | 152 } |
| 153 } | 153 } |
| 154 LibraryLoader.initialize(mCommandLineParams); | 154 LibraryLoader.initialize(mCommandLineParams); |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 299 ChildProcessService service, int[] extraFileIds, int[] extraFileFds, | 299 ChildProcessService service, int[] extraFileIds, int[] extraFileFds, |
| 300 int cpuCount, long cpuFeatures); | 300 int cpuCount, long cpuFeatures); |
| 301 | 301 |
| 302 /** | 302 /** |
| 303 * Force the child process to exit. | 303 * Force the child process to exit. |
| 304 */ | 304 */ |
| 305 private static native void nativeExitChildProcess(); | 305 private static native void nativeExitChildProcess(); |
| 306 | 306 |
| 307 private native void nativeShutdownMainThread(); | 307 private native void nativeShutdownMainThread(); |
| 308 } | 308 } |
| OLD | NEW |