diff options
| author | Mikhail Naganov <mnaganov@chromium.org> | 2016-01-21 17:24:20 -0800 |
|---|---|---|
| committer | Mikhail Naganov <mnaganov@chromium.org> | 2016-01-22 01:28:03 +0000 |
| commit | b61321678f18609dc67ece1747db3166c1bd97aa (patch) | |
| tree | cacac6e84109ef59b20aa92e947ae44bbcd3eae3 /android_webview | |
| parent | 112a6b23c4d72cfcf084be9505632f45d7612c77 (diff) | |
| download | chromium_src-b61321678f18609dc67ece1747db3166c1bd97aa.zip chromium_src-b61321678f18609dc67ece1747db3166c1bd97aa.tar.gz chromium_src-b61321678f18609dc67ece1747db3166c1bd97aa.tar.bz2 | |
[Android WebView] Add child process service to the manifest
Also fix a couple of issues related to linting Java files.
BUG=576927
Review URL: https://codereview.chromium.org/1592943002
Cr-Commit-Position: refs/heads/master@{#370160}
(cherry picked from commit cdb0803bf39a587094e572565e4cf777e7ce0616)
Review URL: https://codereview.chromium.org/1616253002 .
Cr-Commit-Position: refs/branch-heads/2623@{#64}
Cr-Branched-From: 92d77538a86529ca35f9220bd3cd512cbea1f086-refs/heads/master@{#369907}
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/android_webview.gyp | 3 | ||||
| -rw-r--r-- | android_webview/apk/java/AndroidManifest.xml | 9 |
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> |