summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2013-10-29 10:44:38 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-29 10:44:38 -0700
commit96e6ef623ac3e8b44e6a34c694926eb4ef847445 (patch)
treebbacf657d902182d3b4c7f73213f365d68f0d01f
parente0b3f3e106d5b0b9eb31ed3bd43c8a536eb8d1ee (diff)
parent57449569b7290c56f823e90bbfa1281e982ae5f5 (diff)
downloadframeworks_base-96e6ef623ac3e8b44e6a34c694926eb4ef847445.zip
frameworks_base-96e6ef623ac3e8b44e6a34c694926eb4ef847445.tar.gz
frameworks_base-96e6ef623ac3e8b44e6a34c694926eb4ef847445.tar.bz2
am 57449569: am 3bdf60dc: Merge "Doc change: Add update ProGuard keep rules for Google Play Services." into klp-dev
* commit '57449569b7290c56f823e90bbfa1281e982ae5f5': Doc change: Add update ProGuard keep rules for Google Play Services.
-rw-r--r--docs/html/google/play-services/setup.jd13
1 files changed, 13 insertions, 0 deletions
diff --git a/docs/html/google/play-services/setup.jd b/docs/html/google/play-services/setup.jd
index 4d38850..0ac3704 100644
--- a/docs/html/google/play-services/setup.jd
+++ b/docs/html/google/play-services/setup.jd
@@ -81,6 +81,19 @@ both phones and tablets.</p>
-keep class * extends java.util.ListResourceBundle {
protected Object[][] getContents();
}
+
+-keep public class com.google.android.gms.common.internal.safeparcel.SafeParcelable {
+ public static final *** NULL;
+}
+
+-keepnames @com.google.android.gms.common.annotation.KeepName class *
+-keepclassmembernames class * {
+ @com.google.android.gms.common.annotation.KeepName *;
+}
+
+-keepnames class * implements android.os.Parcelable {
+ public static final ** CREATOR;
+}
</pre>
</ol>