Chromium Code Reviews| Index: testing/android/native_test/java/src/org/chromium/native_test/NativeUnitTestActivity.java |
| diff --git a/testing/android/native_test/java/src/org/chromium/native_test/NativeUnitTestActivity.java b/testing/android/native_test/java/src/org/chromium/native_test/NativeUnitTestActivity.java |
| index 84115838972fbedbc8e6b056cfc1ded075cdfca5..1ae49cb0fc37c83d4d4a217934ce0a01617683e5 100644 |
| --- a/testing/android/native_test/java/src/org/chromium/native_test/NativeUnitTestActivity.java |
| +++ b/testing/android/native_test/java/src/org/chromium/native_test/NativeUnitTestActivity.java |
| @@ -17,6 +17,9 @@ import org.chromium.base.library_loader.NativeLibraries; |
| * (i.e., not browser tests) |
| */ |
| public class NativeUnitTestActivity extends NativeTestActivity { |
| + static { |
|
agrieve
2016/05/19 00:42:50
nit: Add a comment about why this is done in a sta
ynovikov
2016/05/20 02:38:10
Done.
|
| + loadLibraries(); |
| + } |
| private static final String TAG = "cr_NativeTest"; |
| @@ -31,15 +34,14 @@ public class NativeUnitTestActivity extends NativeTestActivity { |
| PowerMonitor.createForTests(this); |
| ContextUtils.initApplicationContext(getApplicationContext()); |
| - loadLibraries(); |
| + ContextUtils.initApplicationContextForNative(); |
|
agrieve
2016/05/19 00:42:50
nit: these two ContextUtils calls as well as the P
ynovikov
2016/05/20 02:38:10
Since getApplicationContext() is not static these
agrieve
2016/05/20 14:13:04
Ah, right, makes sense.
Would it work to have load
ynovikov
2016/05/26 03:16:15
Done.
|
| } |
| - private void loadLibraries() { |
| + private static void loadLibraries() { |
| for (String library : NativeLibraries.LIBRARIES) { |
| Log.i(TAG, "loading: %s", library); |
| System.loadLibrary(library); |
| Log.i(TAG, "loaded: %s", library); |
| } |
| - ContextUtils.initApplicationContextForNative(); |
| } |
| } |