| Index: blimp/client/android/AndroidManifest.xml.jinja2
|
| diff --git a/components/cronet/android/test/AndroidManifest.xml b/blimp/client/android/AndroidManifest.xml.jinja2
|
| similarity index 65%
|
| copy from components/cronet/android/test/AndroidManifest.xml
|
| copy to blimp/client/android/AndroidManifest.xml.jinja2
|
| index d4e98dd3646597f3dcfe23a7f3ad57a407776669..00ea5e6e69c7822971a58dfbce5fb253089ccba4 100644
|
| --- a/components/cronet/android/test/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.net">
|
| -
|
| - <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
|
| + 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="CronetTestApplication"
|
| - android:label="Cronet Test">
|
| - <activity android:name="CronetTestActivity"
|
| - 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">
|
|
|