| OLD | NEW |
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. Use of | 2 <!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. Use of |
| 3 this source code is governed by a BSD-style license that can be found | 3 this source code is governed by a BSD-style license that can be found |
| 4 in the LICENSE file. --> | 4 in the LICENSE file. --> |
| 5 <!-- package name must be unique so suffix with "tests" so package loader | 5 <!-- package name must be unique so suffix with "tests" so package loader |
| 6 doesn't ignore this. --> | 6 doesn't ignore this. --> |
| 7 <manifest xmlns:android="http://schemas.android.com/apk/res/android" | 7 <manifest xmlns:android="http://schemas.android.com/apk/res/android" |
| 8 package="org.chromium.content_shell_apk.tests"> | 8 package="org.chromium.content_shell_apk.tests"> |
| 9 <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" /> | 9 <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" /> |
| 10 <uses-permission android:name="android.permission.RUN_INSTRUMENTATION" /> | 10 <uses-permission android:name="android.permission.RUN_INSTRUMENTATION" /> |
| 11 <!-- We add an application tag here just so that we can indicate that this | 11 <!-- We add an application tag here just so that we can indicate that this |
| 12 package needs to link against the android.test library, which is | 12 package needs to link against the android.test library, which is |
| 13 needed when building test cases. --> | 13 needed when building test cases. --> |
| 14 <application> | 14 <application> |
| 15 <uses-library android:name="android.test.runner" /> | 15 <uses-library android:name="android.test.runner" /> |
| 16 <activity android:name="org.chromium.test.broker.OnDeviceInstrumentation
Broker" | 16 <activity android:name="org.chromium.test.broker.OnDeviceInstrumentation
Broker" |
| 17 android:exported="true"/> | 17 android:exported="true"/> |
| 18 </application> | 18 </application> |
| 19 | 19 |
| 20 <instrumentation android:name="org.chromium.base.test.BaseChromiumAndroidJUn
itRunner" | 20 <instrumentation android:name="org.chromium.base.test.BaseChromiumAndroidJUn
itRunner" |
| 21 android:targetPackage="org.chromium.content_shell_apk" | 21 android:targetPackage="org.chromium.content_shell_apk" |
| 22 chromium-junit4="true" | 22 chromium-junit4="true" |
| 23 android:label="JUnit4-based tests for org.chromium.content_shell_apk" /> | 23 android:label="JUnit4-based tests for org.chromium.content_shell_apk" /> |
| 24 <instrumentation android:name="org.chromium.base.test.BaseChromiumInstrument
ationTestRunner" | 24 <instrumentation android:name="org.chromium.content.browser.test.ContentInst
rumentationTestRunner" |
| 25 android:targetPackage="org.chromium.content_shell_apk" | 25 android:targetPackage="org.chromium.content_shell_apk" |
| 26 android:label="Tests for org.chromium.content_shell_apk"/> | 26 android:label="Tests for org.chromium.content_shell_apk"/> |
| 27 </manifest> | 27 </manifest> |
| OLD | NEW |