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

Side by Side Diff: chrome/android/java/AndroidManifest.xml

Issue 1469803007: Extend the multidex logic to only kick in for the main browser application. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review comments Created 5 years 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
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved.
3 Use of this source code is governed by a BSD-style license that can be 3 Use of this source code is governed by a BSD-style license that can be
4 found in the LICENSE file. --> 4 found in the LICENSE file. -->
5 5
6 <!-- 6 <!--
7 Note: This is a jinja2 template, processed at build time into the final manifest . 7 Note: This is a jinja2 template, processed at build time into the final manifest .
8 8
9 Blocks denoted with { % block some_name % }foo{ % endblock % } can be overridden 9 Blocks denoted with { % block some_name % }foo{ % endblock % } can be overridden
10 by a child template that "extends" this file. 10 by a child template that "extends" this file.
(...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after
597 android:process=":sandboxed_process{{ i }}" 597 android:process=":sandboxed_process{{ i }}"
598 android:permission="{{ manifest_package }}.permission.CHILD_SERVICE" 598 android:permission="{{ manifest_package }}.permission.CHILD_SERVICE"
599 android:isolatedProcess="true" 599 android:isolatedProcess="true"
600 android:exported="false" /> 600 android:exported="false" />
601 {% endfor %} 601 {% endfor %}
602 602
603 {% set num_privileged_services = 3 %} 603 {% set num_privileged_services = 3 %}
604 <meta-data android:name="org.chromium.content.browser.NUM_PRIVILEGED_SER VICES" 604 <meta-data android:name="org.chromium.content.browser.NUM_PRIVILEGED_SER VICES"
605 android:value="{{ num_privileged_services }}"/> 605 android:value="{{ num_privileged_services }}"/>
606 {% for i in range(num_privileged_services) %} 606 {% for i in range(num_privileged_services) %}
607 {% set privileged_process_name = ':privileged_process%d' % i %}
608 <!-- TODO(tedchoc): Omit this for release builds as MultiDex is debug on ly. -->
609 <meta-data android:name="{{ manifest_package }}{{ privileged_process_nam e }}.ignore_multidex"
610 android:value="true" />
607 <service android:name="org.chromium.content.app.PrivilegedProcessService {{ i }}" 611 <service android:name="org.chromium.content.app.PrivilegedProcessService {{ i }}"
608 android:process=":privileged_process{{ i }}" 612 android:process="{{ privileged_process_name }}"
609 android:permission="{{ manifest_package }}.permission.CHILD_SERVICE" 613 android:permission="{{ manifest_package }}.permission.CHILD_SERVICE"
610 android:isolatedProcess="false" 614 android:isolatedProcess="false"
611 android:exported="false" /> 615 android:exported="false" />
612 {% endfor %} 616 {% endfor %}
613 617
614 <receiver android:name="org.chromium.chrome.browser.download.OpenDownloa dReceiver"> 618 <receiver android:name="org.chromium.chrome.browser.download.OpenDownloa dReceiver">
615 <intent-filter> 619 <intent-filter>
616 <action android:name="android.intent.action.DOWNLOAD_NOTIFICATIO N_CLICKED"/> 620 <action android:name="android.intent.action.DOWNLOAD_NOTIFICATIO N_CLICKED"/>
617 </intent-filter> 621 </intent-filter>
618 </receiver> 622 </receiver>
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
674 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 678 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
675 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 679 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
676 The downstream manifest replaces this block, and hence replaces the list of media route 680 The downstream manifest replaces this block, and hence replaces the list of media route
677 controllers with its own list. --> 681 controllers with its own list. -->
678 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 682 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
679 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 683 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
680 684
681 {% endblock %} 685 {% endblock %}
682 </application> 686 </application>
683 </manifest> 687 </manifest>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698