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

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

Issue 1691993003: Hook up LeakCanary to ChromePublic.apk (behind a GN arg) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@leak-canary-2
Patch Set: better proguarding Created 4 years, 10 months 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 697 matching lines...) Expand 10 before | Expand all | Expand 10 after
708 708
709 709
710 <meta-data android:name="com.google.android.gms.version" 710 <meta-data android:name="com.google.android.gms.version"
711 android:value="@integer/google_play_services_version" /> 711 android:value="@integer/google_play_services_version" />
712 712
713 <meta-data android:name="org.chromium.content.browser.SMART_CLIP_PROVIDE R" 713 <meta-data android:name="org.chromium.content.browser.SMART_CLIP_PROVIDE R"
714 android:value="org.chromium.content.browser.SmartClipProvider"/> 714 android:value="org.chromium.content.browser.SmartClipProvider"/>
715 <meta-data android:name="org.chromium.components.service_tab_launcher.SE RVICE_TAB_LAUNCHER" 715 <meta-data android:name="org.chromium.components.service_tab_launcher.SE RVICE_TAB_LAUNCHER"
716 android:value="org.chromium.chrome.browser.ChromeServiceTabLa uncher" /> 716 android:value="org.chromium.chrome.browser.ChromeServiceTabLa uncher" />
717 717
718 {% set enable_leakcanary = enable_leakcanary|default(0) %}
719 {% if enable_leakcanary %}
720 <!-- Entries for LeakCanary copied from:
721 //third_party/leakcanary/src/leakcanary-android/src/main/AndroidM anifest.xml
722 -->
723 <service
724 android:name="com.squareup.leakcanary.internal.HeapAnalyzerService "
725 android:process=":leakcanary"
726 android:enabled="false" />
727 <service
728 android:name="com.squareup.leakcanary.DisplayLeakService"
Yaron 2016/02/12 03:01:41 can we put everything leakcanary in a separate pro
agrieve 2016/02/12 18:24:58 Worked fine to move this one there as well. Going
729 android:enabled="false" />
730 <activity
731 android:theme="@style/leak_canary_LeakCanary.Base"
732 android:name="com.squareup.leakcanary.internal.DisplayLeakActivity "
733 android:enabled="false"
734 android:process=":leakcanary2" <!-- Added to avoid StrictMode vio lations crashing the activity -->
735 android:label="@string/leak_canary_display_activity_label"
736 android:icon="@drawable/leak_canary_icon"
737 android:taskAffinity="com.squareup.leakcanary">
738 <intent-filter>
739 <action android:name="android.intent.action.MAIN" />
740 <category android:name="android.intent.category.LAUNCHER" />
Yaron 2016/02/12 03:01:41 does this need to be in launcher? I thought it int
agrieve 2016/02/12 18:24:57 The notification takes you here, but after that th
741 </intent-filter>
742 </activity>
743 <activity
744 android:theme="@style/leak_canary_Theme.Transparent"
745 android:name="com.squareup.leakcanary.internal.RequestStoragePermi ssionActivity"
746 android:taskAffinity="com.squareup.leakcanary"
747 android:enabled="false"
748 android:icon="@drawable/leak_canary_icon"
749 android:label="@string/leak_canary_storage_permission_activity_lab el" />
750 {% endif %}
751
718 {% block extra_application_definitions %} 752 {% block extra_application_definitions %}
719 753
720 <!-- Media route controllers to use for remote playback (cast). 754 <!-- Media route controllers to use for remote playback (cast).
721 This is here, rather than in code, since it varies between upstream and downstream, 755 This is here, rather than in code, since it varies between upstream and downstream,
722 yet we need this list of classes in the notification service, which belongs upstream 756 yet we need this list of classes in the notification service, which belongs upstream
723 and doesn't run the downstream startup code. The Cast code will, fo r each media element, 757 and doesn't run the downstream startup code. The Cast code will, fo r each media element,
724 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 758 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
725 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 759 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
726 The downstream manifest replaces this block, and hence replaces the list of media route 760 The downstream manifest replaces this block, and hence replaces the list of media route
727 controllers with its own list. --> 761 controllers with its own list. -->
728 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 762 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
729 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 763 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
730 764
731 {% endblock %} 765 {% endblock %}
732 </application> 766 </application>
733 </manifest> 767 </manifest>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698