diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2013-10-29 10:42:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-29 10:42:56 -0700 |
| commit | 57449569b7290c56f823e90bbfa1281e982ae5f5 (patch) | |
| tree | 38eb360514735e8eb27b69bc06f10d907542c3ca | |
| parent | 4742fe3cd79cf1f7d0c84ba87ee3ebdd5eb175d0 (diff) | |
| parent | 3bdf60dc290f24d4f3f994466fb2f19d4e01d833 (diff) | |
| download | frameworks_base-57449569b7290c56f823e90bbfa1281e982ae5f5.zip frameworks_base-57449569b7290c56f823e90bbfa1281e982ae5f5.tar.gz frameworks_base-57449569b7290c56f823e90bbfa1281e982ae5f5.tar.bz2 | |
am 3bdf60dc: Merge "Doc change: Add update ProGuard keep rules for Google Play Services." into klp-dev
* commit '3bdf60dc290f24d4f3f994466fb2f19d4e01d833':
Doc change: Add update ProGuard keep rules for Google Play Services.
| -rw-r--r-- | docs/html/google/play-services/setup.jd | 13 |
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> |