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

Side by Side Diff: testing/android/java/AndroidManifest.xml

Issue 723343002: Update from https://crrev.com/304121 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 unified diff | Download patch
OLDNEW
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="14" android:targetSdkVersion="21" /> 13 <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
14 14
15 <application android:label="ChromeNativeTests" 15 <application android:label="ChromeNativeTests"
16 android:name="org.chromium.base.BaseChromiumApplication"> 16 android:name="org.chromium.base.BaseChromiumApplication">
17 <activity android:name=".ChromeNativeTestActivity" 17 <activity android:name=".ChromeNativeTestActivity"
18 android:label="ChromeNativeTest" 18 android:label="ChromeNativeTest"
19 android:configChanges="orientation|keyboardHidden"> 19 android:configChanges="orientation|keyboardHidden">
20 <intent-filter> 20 <intent-filter>
21 <action android:name="android.intent.action.MAIN" /> 21 <action android:name="android.intent.action.MAIN" />
22 <category android:name="android.intent.category.LAUNCHER" /> 22 <category android:name="android.intent.category.LAUNCHER" />
23 </intent-filter> 23 </intent-filter>
24 </activity> 24 </activity>
25 </application> 25 </application>
26 26
27 <instrumentation android:name="org.chromium.native_test.ChromiumNativeTestIn strumentationTestRunner"
28 android:targetPackage="org.chromium.native_test"
29 android:label="Instrumentation entry point for org.chromium.native_t est"/>
30
27 <uses-permission android:name="android.permission.CAMERA" /> 31 <uses-permission android:name="android.permission.CAMERA" />
28 <uses-permission android:name="android.permission.INTERNET"/> 32 <uses-permission android:name="android.permission.INTERNET"/>
29 <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/> 33 <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
30 <uses-permission android:name="android.permission.RECORD_AUDIO"/> 34 <uses-permission android:name="android.permission.RECORD_AUDIO"/>
31 <uses-permission android:name="android.permission.WAKE_LOCK"/> 35 <uses-permission android:name="android.permission.WAKE_LOCK"/>
32 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> 36 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
33 37
34 </manifest> 38 </manifest>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698