chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java - Issue 59533009: Check library version and handle library load errors

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java

Issue 59533009: Check library version and handle library load errors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Respond to second round of review comments. Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« build/android/gyp/create_native_libraries_header.py ('K') | « chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java ('k') | chrome/android/testshell/java/src/org/chromium/chrome/testshell/signin/AccountsChangedReceiver.java » ('j') | content/app/android/library_loader_hooks.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java

diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java

index c5c65af24af6f7124e74e3e8c186be32c2717855..19db9d16951a288bc78886c764d8b8f804ee013c 100644

--- a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java

+++ b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java

@@ -25,6 +25,7 @@ import org.chromium.content.browser.ContentView;

import org.chromium.content.browser.ContentViewClient;

import org.chromium.content.browser.DeviceUtils;

import org.chromium.content.common.CommandLine;

+import org.chromium.content.common.ProcessInitException;

import org.chromium.sync.signin.ChromeSigninController;

import org.chromium.ui.base.ActivityWindowAndroid;

import org.chromium.ui.base.WindowAndroid;

@@ -65,7 +66,13 @@ public class ChromiumTestShellActivity extends Activity implements MenuHandler {

finish();

}

};

- BrowserStartupController.get(this).startBrowserProcessesAsync(callback);

+ try {

+ BrowserStartupController.get(this).startBrowserProcessesAsync(callback);

+ }

+ catch (ProcessInitException e) {

+ Log.e(TAG, "Unable to load native library.", e);

+ System.exit(-1);

+ }

}

private void finishInitialization(final Bundle savedInstanceState) {