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

Unified Diff: base/android/base_proguard_config.flags

Issue 2269143005: Add a -keep for all Parcelables in hopes it fixes crash in the wild (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: added crbug Created 4 years, 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/android/base_proguard_config.flags
diff --git a/base/android/base_proguard_config.flags b/base/android/base_proguard_config.flags
index f8b733d346ca196506d994dc9450796f5650b7b6..2775360d62a57b800c71c72b4c2026c74896cded 100644
--- a/base/android/base_proguard_config.flags
+++ b/base/android/base_proguard_config.flags
@@ -37,13 +37,20 @@
native <methods>;
}
-# Keep all Parcelables as they might be marshalled outside Chrome.
--keepnames class * implements android.os.Parcelable
-
+# Keep all CREATOR fields within Parcelable that are kept.
-keepclassmembers class * implements android.os.Parcelable {
public static *** CREATOR;
}
+# Don't obfuscate Parcelables as they might be marshalled outside Chrome.
+-keepnames class * implements android.os.Parcelable
+
+# Keep all Parcelables, since Play Services has some that are used only by
+# reflection.
+# TODO(agrieve): Remove this once proguard flags provided by play services via
+# .aars are used. https://crbug.com/640836
+-keep class * implements android.os.Parcelable
+
# Remove methods annotated with this if their return value is unused
-assumenosideeffects class ** {
@org.chromium.base.annotations.RemovableInRelease <methods>;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698