Index: testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java.jinja2 |
diff --git a/testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java b/testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java.jinja2 |
similarity index 95% |
rename from testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java |
rename to testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java.jinja2 |
index 1e1cb119a3c78a8e09b6c1d3936fedb3501beddc..5dbb3d3ac94fcbd4b8ffdbb698e1a5afce1a2175 100644 |
--- a/testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java |
+++ b/testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java.jinja2 |
@@ -4,7 +4,11 @@ |
package org.chromium.native_test; |
+{% if use_native_activity == 'true' %} |
+import android.app.NativeActivity; |
+{% else %} |
import android.app.Activity; |
+{% endif %} |
import android.content.Context; |
import android.content.Intent; |
import android.os.Bundle; |
@@ -28,7 +32,11 @@ import java.util.Iterator; |
* the native activity class loader. |
*/ |
@JNINamespace("testing::android") |
+{% if use_native_activity == 'true' %} |
+public class NativeTestActivity extends NativeActivity { |
+{% else %} |
public class NativeTestActivity extends Activity { |
+{% endif %} |
public static final String EXTRA_COMMAND_LINE_FILE = |
"org.chromium.native_test.NativeTestActivity.CommandLineFile"; |
public static final String EXTRA_COMMAND_LINE_FLAGS = |
@@ -137,6 +145,9 @@ public class NativeTestActivity extends Activity { |
public void onStart() { |
super.onStart(); |
+{% if use_native_activity == 'true' %} |
+ mRunInSubThread = true; |
+{% endif %} |
if (mRunInSubThread) { |
// Create a new thread and run tests on it. |
new Thread() { |