OLD | NEW |
---|---|
1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
2 <!-- | 2 <!-- |
3 Copyright 2014 The Chromium Authors. All rights reserved. | 3 Copyright 2014 The Chromium Authors. All rights reserved. |
4 Use of this source code is governed by a BSD-style license that can be | 4 Use of this source code is governed by a BSD-style license that can be |
5 found in the LICENSE file. | 5 found in the LICENSE file. |
6 --> | 6 --> |
7 | 7 |
8 <manifest xmlns:android="http://schemas.android.com/apk/res/android" | 8 <manifest xmlns:android="http://schemas.android.com/apk/res/android" |
9 package="org.chromium.native_test" | 9 package="org.chromium.native_test" |
10 android:versionCode="1" | 10 android:versionCode="1" |
11 android:versionName="1.0"> | 11 android:versionName="1.0"> |
12 | 12 |
13 <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22" /> | 13 <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22" /> |
14 <uses-permission android:name="android.permission.BLUETOOTH"/> | 14 <uses-permission android:name="android.permission.BLUETOOTH"/> |
15 <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/> | 15 <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/> |
16 <uses-permission android:name="android.permission.CAMERA" /> | 16 <uses-permission android:name="android.permission.CAMERA" /> |
17 <uses-permission android:name="android.permission.GET_ACCOUNTS"/> | |
17 <uses-permission android:name="android.permission.INTERNET"/> | 18 <uses-permission android:name="android.permission.INTERNET"/> |
19 <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/> | |
18 <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/> | 20 <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/> |
19 <uses-permission android:name="android.permission.RECORD_AUDIO"/> | 21 <uses-permission android:name="android.permission.RECORD_AUDIO"/> |
22 <uses-permission android:name="android.permission.USE_CREDENTIALS"/> | |
20 <uses-permission android:name="android.permission.WAKE_LOCK"/> | 23 <uses-permission android:name="android.permission.WAKE_LOCK"/> |
21 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> | 24 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> |
22 | 25 |
23 <application android:label="NativeTests" | 26 <application android:label="NativeTests" |
24 android:name="org.chromium.base.BaseChromiumApplication"> | 27 android:name="org.chromium.base.BaseChromiumApplication"> |
25 <activity android:name=".NativeUnitTestActivity" | 28 <activity android:name=".NativeUnitTestActivity" |
26 android:label="NativeTest" | 29 android:label="NativeTest" |
27 android:configChanges="orientation|keyboardHidden"> | 30 android:configChanges="orientation|keyboardHidden"> |
28 <intent-filter> | 31 <intent-filter> |
29 <action android:name="android.intent.action.MAIN" /> | 32 <action android:name="android.intent.action.MAIN" /> |
30 <category android:name="android.intent.category.LAUNCHER" /> | 33 <category android:name="android.intent.category.LAUNCHER" /> |
31 </intent-filter> | 34 </intent-filter> |
32 </activity> | 35 </activity> |
36 <service android:name="org.chromium.net.test.DummySpnegoAuthenticatorSer vice" | |
37 android:process=":dummyAuthenticator"> | |
Bernhard Bauer
2015/06/10 17:11:03
I think this should be indented 8 spaces.
aberent
2015/06/15 15:52:20
Done.
| |
38 <intent-filter> | |
39 <action android:name="android.accounts.AccountAuthenticator" /> | |
Bernhard Bauer
2015/06/10 17:11:03
And this four spaces.
aberent
2015/06/15 15:52:19
Done.
| |
40 </intent-filter> | |
41 <meta-data android:name="android.accounts.AccountAuthenticator" | |
42 android:resource="@xml/dummy_spnego_authenticator" /> | |
Bernhard Bauer
2015/06/10 17:11:03
And this 8 again :)
aberent
2015/06/15 15:52:19
Done.
| |
43 </service> | |
33 </application> | 44 </application> |
34 | 45 |
35 <instrumentation android:name="org.chromium.native_test.NativeTestInstrument ationTestRunner" | 46 <instrumentation android:name="org.chromium.native_test.NativeTestInstrument ationTestRunner" |
36 android:targetPackage="org.chromium.native_test" | 47 android:targetPackage="org.chromium.native_test" |
37 android:label="Instrumentation entry point for org.chromium.native_t est"/> | 48 android:label="Instrumentation entry point for org.chromium.native_t est"/> |
38 | 49 |
39 </manifest> | 50 </manifest> |
OLD | NEW |