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

Side by Side Diff: android_webview/apk/java/AndroidManifest.xml

Issue 2414333002: Set 32-bit ABI flag in WebView manifest. (Closed)
Patch Set: Created 4 years, 2 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- 2 <!--
3 Copyright (c) 2012 The Chromium Authors. All rights reserved. Use of this 3 Copyright (c) 2012 The Chromium Authors. All rights reserved. Use of this
4 source code is governed by a BSD-style license that can be found in the 4 source code is governed by a BSD-style license that can be found in the
5 LICENSE file. 5 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 xmlns:tools="http://schemas.android.com/tools" 9 xmlns:tools="http://schemas.android.com/tools"
10 package="{{package|default('com.android.webview')}}"> 10 package="{{package|default('com.android.webview')}}">
11 <uses-sdk android:minSdkVersion="{{minsdk|default(21)}}" 11 <uses-sdk android:minSdkVersion="{{minsdk|default(21)}}"
12 android:targetSdkVersion="{{targetsdk|default(24)}}"> 12 android:targetSdkVersion="{{targetsdk|default(24)}}">
13 </uses-sdk> 13 </uses-sdk>
14 14
15 <uses-feature android:name="android.hardware.touchscreen" 15 <uses-feature android:name="android.hardware.touchscreen"
16 android:required="false"/> 16 android:required="false"/>
17 17
18 <application android:label="Android System WebView" 18 <application android:label="Android System WebView"
19 android:icon="@drawable/icon_webview" 19 android:icon="@drawable/icon_webview"
20 android:multiArch="true"> 20 android:multiArch="true"
21 android:use32bitAbi="true">
21 {# This part is shared between stand-alone WebView and Monochrome #} 22 {# This part is shared between stand-alone WebView and Monochrome #}
22 {% macro common(manifest_package, webview_lib) %} 23 {% macro common(manifest_package, webview_lib) %}
23 <activity android:name="com.android.webview.chromium.LicenseActivity " 24 <activity android:name="com.android.webview.chromium.LicenseActivity "
24 android:label="@string/license_activity_title"> 25 android:label="@string/license_activity_title">
25 <intent-filter> 26 <intent-filter>
26 <action android:name="android.settings.WEBVIEW_LICENSE" /> 27 <action android:name="android.settings.WEBVIEW_LICENSE" />
27 <category android:name="android.intent.category.DEFAULT" /> 28 <category android:name="android.intent.category.DEFAULT" />
28 </intent-filter> 29 </intent-filter>
29 <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CO NTROLLED" 30 <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CO NTROLLED"
30 android:value="true" /> 31 android:value="true" />
(...skipping 10 matching lines...) Expand all
41 <service android:name="org.chromium.content.app.SandboxedProcessService0 " 42 <service android:name="org.chromium.content.app.SandboxedProcessService0 "
42 android:process=":sandboxed_process0" 43 android:process=":sandboxed_process0"
43 android:isolatedProcess="true" 44 android:isolatedProcess="true"
44 android:exported="true" 45 android:exported="true"
45 android:externalService="true" 46 android:externalService="true"
46 tools:ignore="ExportedService" /> 47 tools:ignore="ExportedService" />
47 <meta-data android:name="org.chromium.content.browser.NUM_PRIVILEGED_SER VICES" 48 <meta-data android:name="org.chromium.content.browser.NUM_PRIVILEGED_SER VICES"
48 android:value="0"/> 49 android:value="0"/>
49 </application> 50 </application>
50 </manifest> 51 </manifest>
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698