| 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="23" /> | 13 <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" /> |
| 14 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> | 14 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> |
| 15 <uses-permission android:name="android.permission.BLUETOOTH"/> | 15 <uses-permission android:name="android.permission.BLUETOOTH"/> |
| 16 <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/> | 16 <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/> |
| 17 <uses-permission android:name="android.permission.CAMERA" /> | 17 <uses-permission android:name="android.permission.CAMERA" /> |
| 18 <uses-permission android:name="android.permission.INTERNET"/> | 18 <uses-permission android:name="android.permission.INTERNET"/> |
| 19 <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/> | 19 <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/> |
| 20 <uses-permission android:name="android.permission.RECORD_AUDIO"/> | 20 <uses-permission android:name="android.permission.RECORD_AUDIO"/> |
| 21 <uses-permission android:name="android.permission.WAKE_LOCK"/> | 21 <uses-permission android:name="android.permission.WAKE_LOCK"/> |
| 22 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> | 22 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> |
| 23 | 23 |
| 24 <application android:label="NativeTests" | 24 <application android:label="NativeTests" |
| 25 android:name="org.chromium.base.BaseChromiumApplication"> | 25 android:name="org.chromium.base.BaseChromiumApplication"> |
| 26 {% if use_native_activity == 'true' %} |
| 27 <activity android:name=".NativeUnitTestNativeActivity" |
| 28 android:label="NativeTest" |
| 29 android:configChanges="orientation|keyboardHidden" |
| 30 android:process=":test_process"> |
| 31 {% if is_component_build == 'true' %} |
| 32 <meta-data android:name="android.app.lib_name" |
| 33 android:value="{{ native_library_name }}.cr" /> |
| 34 {% else %} |
| 35 <meta-data android:name="android.app.lib_name" |
| 36 android:value="{{ native_library_name }}" /> |
| 37 {% endif %} |
| 38 {% else %} |
| 26 <activity android:name=".NativeUnitTestActivity" | 39 <activity android:name=".NativeUnitTestActivity" |
| 27 android:label="NativeTest" | 40 android:label="NativeTest" |
| 28 android:configChanges="orientation|keyboardHidden" | 41 android:configChanges="orientation|keyboardHidden" |
| 29 android:process=":test_process"> | 42 android:process=":test_process"> |
| 43 {% endif %} |
| 30 <intent-filter> | 44 <intent-filter> |
| 31 <action android:name="android.intent.action.MAIN" /> | 45 <action android:name="android.intent.action.MAIN" /> |
| 32 <category android:name="android.intent.category.LAUNCHER" /> | 46 <category android:name="android.intent.category.LAUNCHER" /> |
| 33 </intent-filter> | 47 </intent-filter> |
| 34 </activity> | 48 </activity> |
| 35 </application> | 49 </application> |
| 36 | 50 |
| 37 <instrumentation android:name="org.chromium.native_test.NativeTestInstrument
ationTestRunner" | 51 <instrumentation android:name="org.chromium.native_test.NativeTestInstrument
ationTestRunner" |
| 38 android:targetPackage="org.chromium.native_test" | 52 android:targetPackage="org.chromium.native_test" |
| 39 android:label="Instrumentation entry point for org.chromium.native_t
est"/> | 53 android:label="Instrumentation entry point for org.chromium.native_t
est"/> |
| 40 | 54 |
| 41 </manifest> | 55 </manifest> |
| OLD | NEW |