summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/android_webview.gyp3
-rw-r--r--android_webview/apk/java/AndroidManifest.xml9
2 files changed, 11 insertions, 1 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index 626d1b8..537cdbf 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -457,7 +457,8 @@
'has_java_resources': 1,
'R_package': 'org.chromium.android_webview',
'R_package_relpath': 'org/chromium/android_webview',
- 'android_manifest_path': '../android_webview/apk/java/AndroidManifest.xml', # for lint
+ # for lint; do not use the system webview's manifest because it's a template
+ 'android_manifest_path': '../android_webview/test/shell/AndroidManifest.xml',
},
'conditions': [
['configuration_policy==1', {
diff --git a/android_webview/apk/java/AndroidManifest.xml b/android_webview/apk/java/AndroidManifest.xml
index 3e979a6..4a78c94 100644
--- a/android_webview/apk/java/AndroidManifest.xml
+++ b/android_webview/apk/java/AndroidManifest.xml
@@ -32,5 +32,14 @@
android:authorities="{{package|default('com.android.webview')}}.LicenseContentProvider" />
<meta-data android:name="com.android.webview.WebViewLibrary"
android:value="libwebviewchromium.so" />
+ <meta-data android:name="org.chromium.content.browser.NUM_SANDBOXED_SERVICES"
+ android:value="1"/>
+ <service android:name="org.chromium.content.app.SandboxedProcessService0"
+ android:process=":sandboxed_process0"
+ android:isolatedProcess="true"
+ android:exported="false"
+ {{sandboxed_service_extra_flags|default('')}} />
+ <meta-data android:name="org.chromium.content.browser.NUM_PRIVILEGED_SERVICES"
+ android:value="0"/>
</application>
</manifest>