From cdb0803bf39a587094e572565e4cf777e7ce0616 Mon Sep 17 00:00:00 2001
From: mnaganov <mnaganov@chromium.org>
Date: Tue, 19 Jan 2016 11:24:47 -0800
Subject: [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}
---
 android_webview/android_webview.gyp          | 3 ++-
 android_webview/apk/java/AndroidManifest.xml | 9 +++++++++
 build/android/lint_action.gypi               | 1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

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>
diff --git a/build/android/lint_action.gypi b/build/android/lint_action.gypi
index f38e5c9..5369f64 100644
--- a/build/android/lint_action.gypi
+++ b/build/android/lint_action.gypi
@@ -23,6 +23,7 @@
   'inputs': [
     '<(DEPTH)/build/android/gyp/util/build_utils.py',
     '<(DEPTH)/build/android/gyp/lint.py',
+    '<(android_manifest_path)',
     '<(suppressions_file)',
     '<(lint_jar_path)',
   ],
-- 
cgit v1.1