| 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.chrome.sync_shell.tests"> | 8 package="org.chromium.chrome.sync_shell.tests"> |
| 9 <!-- We add an application tag here just so that we can indicate that this | 9 <!-- We add an application tag here just so that we can indicate that this |
| 10 package needs to link against the android.test library, which is | 10 package needs to link against the android.test library, which is |
| 11 needed when building test cases. --> | 11 needed when building test cases. --> |
| 12 <application> | 12 <application> |
| 13 <uses-library android:name="android.test.runner" /> | 13 <uses-library android:name="android.test.runner" /> |
| 14 <activity android:name="org.chromium.sync.test.util.MockGrantCredentials
PermissionActivity" | 14 <activity android:name="org.chromium.sync.test.util.MockGrantCredentials
PermissionActivity" |
| 15 android:exported="false"> | 15 android:exported="false"> |
| 16 <intent-filter> | 16 <intent-filter> |
| 17 <action android:name="android.intent.action.VIEW" /> | 17 <action android:name="android.intent.action.VIEW" /> |
| 18 <category android:name="android.intent.category.DEFAULT" /> | 18 <category android:name="android.intent.category.DEFAULT" /> |
| 19 </intent-filter> | 19 </intent-filter> |
| 20 </activity> | 20 </activity> |
| 21 </application> | 21 </application> |
| 22 <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="20" /> | 22 <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" /> |
| 23 <instrumentation android:name="android.test.InstrumentationTestRunner" | 23 <instrumentation android:name="android.test.InstrumentationTestRunner" |
| 24 android:targetPackage="org.chromium.chrome.sync_shell" | 24 android:targetPackage="org.chromium.chrome.sync_shell" |
| 25 android:label="Tests for org.chromium.chrome.sync_shell"/> | 25 android:label="Tests for org.chromium.chrome.sync_shell"/> |
| 26 <uses-permission android:name="android.permission.RUN_INSTRUMENTATION" /> | 26 <uses-permission android:name="android.permission.RUN_INSTRUMENTATION" /> |
| 27 <uses-permission android:name="android.permission.INJECT_EVENTS" /> | 27 <uses-permission android:name="android.permission.INJECT_EVENTS" /> |
| 28 <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" /> | 28 <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" /> |
| 29 <uses-permission android:name="android.permission.READ_LOGS"/> | 29 <uses-permission android:name="android.permission.READ_LOGS"/> |
| 30 <uses-permission android:name="android.permission.WAKE_LOCK" /> | 30 <uses-permission android:name="android.permission.WAKE_LOCK" /> |
| 31 </manifest> | 31 </manifest> |
| OLD | NEW |