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

Unified Diff: mojo/shell/android/apk/AndroidManifest.xml

Issue 1049993002: Get mojo_shell building inside chromium checkout. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix presubmit Created 5 years, 9 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/shell/android/android_handler_loader.cc ('k') | mojo/shell/android/apk/res/values/strings.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/android/apk/AndroidManifest.xml
diff --git a/components/cronet/android/test/AndroidManifest.xml b/mojo/shell/android/apk/AndroidManifest.xml
similarity index 57%
copy from components/cronet/android/test/AndroidManifest.xml
copy to mojo/shell/android/apk/AndroidManifest.xml
index d4e98dd3646597f3dcfe23a7f3ad57a407776669..0d374c94d5f22934258ebd9439b8c29e42346890 100644
--- a/components/cronet/android/test/AndroidManifest.xml
+++ b/mojo/shell/android/apk/AndroidManifest.xml
@@ -1,29 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Chromium Authors. All rights reserved.
+<!-- Copyright 2013 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.chromium.net">
+ package="org.chromium.mojo.shell">
- <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
+ <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
<uses-permission android:name="android.permission.INTERNET"/>
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
- <application android:name="CronetTestApplication"
- android:label="Cronet Test">
- <activity android:name="CronetTestActivity"
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+
+ <application android:name="MojoShellApplication"
+ android:label="Mojo Shell">
+ <meta-data android:name="com.google.android.gms.version"
+ android:value="@integer/google_play_services_version" />
+ <activity android:name="MojoShellActivity"
android:launchMode="singleTask"
android:theme="@android:style/Theme.Holo.Light.NoActionBar"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize"
android:hardwareAccelerated="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.LAUNCHER"/>
+ <action android:name="android.intent.action.VIEW"/>
</intent-filter>
</activity>
</application>
+
</manifest>
« no previous file with comments | « mojo/shell/android/android_handler_loader.cc ('k') | mojo/shell/android/apk/res/values/strings.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698