testing/android/java/AndroidManifest.xml - Issue 862133002: Update from https://crrev.com/312398

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

Issue 862133002: Update from https://crrev.com/312398 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 5 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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="14" android:targetSdkVersion="21" />	13 <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />

14	14

	15 <uses-permission android:name="android.permission.CAMERA" />

	16 <uses-permission android:name="android.permission.INTERNET"/>

	17 <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>

	18 <uses-permission android:name="android.permission.RECORD_AUDIO"/>

	19 <uses-permission android:name="android.permission.WAKE_LOCK"/>

	20 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

	21

15 <application android:label="ChromeNativeTests"	22 <application android:label="ChromeNativeTests"

16 android:name="org.chromium.base.BaseChromiumApplication">	23 android:name="org.chromium.base.BaseChromiumApplication">

17 <activity android:name=".ChromeNativeTestActivity"	24 <activity android:name=".ChromeNativeTestActivity"

18 android:label="ChromeNativeTest"	25 android:label="ChromeNativeTest"

19 android:configChanges="orientation\|keyboardHidden">	26 android:configChanges="orientation\|keyboardHidden">

20 <intent-filter>	27 <intent-filter>

21 <action android:name="android.intent.action.MAIN" />	28 <action android:name="android.intent.action.MAIN" />

22 <category android:name="android.intent.category.LAUNCHER" />	29 <category android:name="android.intent.category.LAUNCHER" />

23 </intent-filter>	30 </intent-filter>

24 </activity>	31 </activity>

25 </application>	32 </application>

26	33

27 <instrumentation android:name="org.chromium.native_test.ChromeNativeTestInst rumentationTestRunner"	34 <instrumentation android:name="org.chromium.native_test.ChromeNativeTestInst rumentationTestRunner"

28 android:targetPackage="org.chromium.native_test"	35 android:targetPackage="org.chromium.native_test"

29 android:label="Instrumentation entry point for org.chromium.native_t est"/>	36 android:label="Instrumentation entry point for org.chromium.native_t est"/>

30	37

31 <uses-permission android:name="android.permission.CAMERA" />

32 <uses-permission android:name="android.permission.INTERNET"/>

33 <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>

34 <uses-permission android:name="android.permission.RECORD_AUDIO"/>

35 <uses-permission android:name="android.permission.WAKE_LOCK"/>

36 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

37

38 </manifest>	38 </manifest>

OLD	NEW

« shell/BUILD.gn ('K') | « sky/engine/wtf/BUILD.gn ('k') | testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java » ('j') | no next file with comments »