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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/AndroidManifest.xml
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
index 914ef9ac4e4a6a168f70252cb5eae9b08d22ff46..972fdea9dca38d8210da6cf3d40c462d9a09e249 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -715,6 +715,40 @@ android:value="true" />
<meta-data android:name="org.chromium.components.service_tab_launcher.SERVICE_TAB_LAUNCHER"
android:value="org.chromium.chrome.browser.ChromeServiceTabLauncher" />
+ {% set enable_leakcanary = enable_leakcanary|default(0) %}
+ {% if enable_leakcanary %}
+ <!-- Entries for LeakCanary copied from:
+ //third_party/leakcanary/src/leakcanary-android/src/main/AndroidManifest.xml
+ -->
+ <service
+ android:name="com.squareup.leakcanary.internal.HeapAnalyzerService"
+ android:process=":leakcanary"
+ android:enabled="false" />
+ <service
+ 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
+ android:enabled="false" />
+ <activity
+ android:theme="@style/leak_canary_LeakCanary.Base"
+ android:name="com.squareup.leakcanary.internal.DisplayLeakActivity"
+ android:enabled="false"
+ android:process=":leakcanary2" <!-- Added to avoid StrictMode violations crashing the activity -->
+ android:label="@string/leak_canary_display_activity_label"
+ android:icon="@drawable/leak_canary_icon"
+ android:taskAffinity="com.squareup.leakcanary">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <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
+ </intent-filter>
+ </activity>
+ <activity
+ android:theme="@style/leak_canary_Theme.Transparent"
+ android:name="com.squareup.leakcanary.internal.RequestStoragePermissionActivity"
+ android:taskAffinity="com.squareup.leakcanary"
+ android:enabled="false"
+ android:icon="@drawable/leak_canary_icon"
+ android:label="@string/leak_canary_storage_permission_activity_label" />
+ {% endif %}
+
{% block extra_application_definitions %}
<!-- Media route controllers to use for remote playback (cast).

Powered by Google App Engine
This is Rietveld 408576698