Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(86)

Unified Diff: testing/android/native_test/java/AndroidManifest.xml.jinja2

Issue 1975153003: Enable NativeActivity based Android tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months 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
Index: testing/android/native_test/java/AndroidManifest.xml.jinja2
diff --git a/testing/android/native_test/java/AndroidManifest.xml b/testing/android/native_test/java/AndroidManifest.xml.jinja2
similarity index 74%
rename from testing/android/native_test/java/AndroidManifest.xml
rename to testing/android/native_test/java/AndroidManifest.xml.jinja2
index a50ffcdeec1640872f24237a8a56b8956356d020..9f46ae529df48cefcd6a4f6ee56cfebe88124df4 100644
--- a/testing/android/native_test/java/AndroidManifest.xml
+++ b/testing/android/native_test/java/AndroidManifest.xml.jinja2
@@ -23,10 +23,24 @@ found in the LICENSE file.
<application android:label="NativeTests"
android:name="org.chromium.base.BaseChromiumApplication">
+ {% if use_native_activity == 'true' %}
+ <activity android:name=".NativeUnitTestNativeActivity"
+ android:label="NativeTest"
+ android:configChanges="orientation|keyboardHidden"
+ android:process=":test_process">
+ {% if is_component_build == 'true' %}
+ <meta-data android:name="android.app.lib_name"
+ android:value="{{ native_library_name }}.cr" />
+ {% else %}
+ <meta-data android:name="android.app.lib_name"
+ android:value="{{ native_library_name }}" />
+ {% endif %}
+ {% else %}
<activity android:name=".NativeUnitTestActivity"
android:label="NativeTest"
android:configChanges="orientation|keyboardHidden"
android:process=":test_process">
+ {% endif %}
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />

Powered by Google App Engine
This is Rietveld 408576698