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

Unified Diff: blimp/client/android/AndroidManifest.xml.jinja2

Issue 1295243003: Initial commit of the blimp/ folder and target (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address final nits. Created 5 years, 3 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
Index: blimp/client/android/AndroidManifest.xml.jinja2
diff --git a/components/cronet/android/sample/AndroidManifest.xml b/blimp/client/android/AndroidManifest.xml.jinja2
similarity index 65%
copy from components/cronet/android/sample/AndroidManifest.xml
copy to blimp/client/android/AndroidManifest.xml.jinja2
index 0d21a6915b0152651bb7bcfdde4c534a9e5c17de..00ea5e6e69c7822971a58dfbce5fb253089ccba4 100644
--- a/components/cronet/android/sample/AndroidManifest.xml
+++ b/blimp/client/android/AndroidManifest.xml.jinja2
@@ -1,22 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Chromium Authors. All rights reserved.
-
+<!-- Copyright 2015 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.
- -->
+ found in the LICENSE file. -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.chromium.cronet_sample_apk">
-
- <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
+ package="org.chromium.blimp">
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21" />
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<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="CronetSampleApplication"
- android:label="Cronet Sample">
- <activity android:name="CronetSampleActivity"
- android:launchMode="singleTask"
+ <application android:name="BlimpApplication"
+ android:label="Blimp">
+ <activity android:name="BlimpRendererActivity"
+ android:launchMode="standard"
android:theme="@android:style/Theme.Holo.Light.NoActionBar"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize"
android:hardwareAccelerated="true">

Powered by Google App Engine
This is Rietveld 408576698