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

Unified Diff: blimp/client/android/javatests/AndroidManifest.xml.jinja2

Issue 1365823002: Add basic test suite for Blimp (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@blimp_strings
Patch Set: Forgot to remove blimp_tests from another linux gn bot Created 5 years, 3 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: blimp/client/android/javatests/AndroidManifest.xml.jinja2
diff --git a/chrome/android/sync_shell/javatests/AndroidManifest.xml b/blimp/client/android/javatests/AndroidManifest.xml.jinja2
similarity index 63%
copy from chrome/android/sync_shell/javatests/AndroidManifest.xml
copy to blimp/client/android/javatests/AndroidManifest.xml.jinja2
index eb83976b9d7bc210985e7f8a281e79b80c4c9ac5..71ae5af3011bc633e9f3c3686f8c48bfa1acbc4a 100644
--- a/chrome/android/sync_shell/javatests/AndroidManifest.xml
+++ b/blimp/client/android/javatests/AndroidManifest.xml.jinja2
@@ -5,8 +5,9 @@
<!-- package name must be unique. -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.chromium.chrome.sync_shell.tests">
- <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22" />
+ package="org.chromium.blimp.tests">
+
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
<uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" />
<uses-permission android:name="android.permission.READ_LOGS"/>
<uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -14,19 +15,12 @@
<uses-permission android:name="android.permission.INTERNET" />
<application
- android:label="ChromeSyncShellTest">
-
+ android:label="BlimpTest">
<uses-library android:name="android.test.runner" />
-
- <activity android:name="org.chromium.sync.test.util.MockGrantCredentialsPermissionActivity"
- android:exported="true">
- <intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- </activity>
</application>
- <instrumentation android:name="org.chromium.chrome.test.ChromeInstrumentationTestRunner"
+
+
+ <instrumentation android:name="org.chromium.base.test.BaseInstrumentationTestRunner"
android:targetPackage="{{manifest_package}}"
android:label="Tests for {{manifest_package}}"/>
</manifest>

Powered by Google App Engine
This is Rietveld 408576698