Commit d12988d9 authored by Matthew Cary's avatar Matthew Cary Committed by Commit Bot

cygprofile: Manifest changes for isolated processes necessary for O.

Starting from Android O it is no longer possible to run any of the
processes isolated. However, it is not necessary if SELinux is in
permissive mode, which the orderfile generator sets (see
tools/cygprofile/profile_android_startup.py in _SetUpDevice).

This CL therefore removes the orderfile-specific changes to the android
manifest for all builds.

Bug: 758566
Change-Id: If3a8e0a3f0dfe81b034b4e0b080db53f661ef265
Reviewed-on: https://chromium-review.googlesource.com/970660Reviewed-by: default avatarBernhard Bauer <bauerb@chromium.org>
Reviewed-by: default avatarBenoit L <lizeb@chromium.org>
Commit-Queue: Matthew Cary <mattcary@chromium.org>
Cr-Commit-Position: refs/heads/master@{#544692}
parent 02a4180d
......@@ -23,10 +23,6 @@ default_chrome_public_jinja_variables = [
"enable_vr=$enable_vr",
]
if (use_order_profiling) {
default_chrome_public_jinja_variables += [ "use_order_profiling=1" ]
}
template("chrome_public_apk_tmpl") {
android_apk(target_name) {
forward_variables_from(invoker, "*")
......
......@@ -784,20 +784,12 @@ by a child template that "extends" this file.
android:exported="false">
</service>
<!-- Service for decoding images in a sandboxed process. When
use_order_profiling is set, all processes need to be able to write
profiling information and thus cannot be sandboxed. Order profiling
is used only on bots to optimize binary layout, and is never used
for a released version of chrome. -->
<!-- Service for decoding images in a sandboxed process. -->
<service
android:description="@string/decoder_description"
android:name="org.chromium.chrome.browser.photo_picker.DecoderService"
android:exported="false"
{% if use_order_profiling is defined %}
android:isolatedProcess="false"
{% else %}
android:isolatedProcess="true"
{% endif %}
android:process=":decoder_service" />
<!-- Providers for chrome data. -->
......@@ -1037,18 +1029,10 @@ by a child template that "extends" this file.
android:value="{{ num_sandboxed_services }}"/>
{% for i in range(num_sandboxed_services) %}
<!-- When use_order_profiling is set, the renderer processes need to be
able to write profiling information and thus cannot be
sandboxed. Order profiling is used only on bots to optimize binary
layout, and is never used for a released version of chrome. -->
<service android:name="org.chromium.content.app.SandboxedProcessService{{ i }}"
android:process=":sandboxed_process{{ i }}"
android:permission="{{ manifest_package }}.permission.CHILD_SERVICE"
{% if use_order_profiling is defined %}
android:isolatedProcess="false"
{% else %}
android:isolatedProcess="true"
{% endif %}
android:exported="{{sandboxed_service_exported|default(false)}}"
{% if (sandboxed_service_exported|default(false)) == 'true' %}
android:externalService="true"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment