diff options
| author | Chris Warrington <cmw@google.com> | 2015-07-07 15:49:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-07 15:49:00 +0000 |
| commit | bffde0a6d2a1fb2969ef85850d53be124a98d064 (patch) | |
| tree | 3878a3e39e3f2fc628793e94311d0adb3f4c3214 | |
| parent | 83d4b7ddf1a68c56de62036c475c7a1b08adfab8 (diff) | |
| parent | 334d9faa135ae4683ba2e4e4c6c53b7b4bcbc74d (diff) | |
| download | platform_sdk-bffde0a6d2a1fb2969ef85850d53be124a98d064.tar.gz platform_sdk-bffde0a6d2a1fb2969ef85850d53be124a98d064.tar.bz2 platform_sdk-bffde0a6d2a1fb2969ef85850d53be124a98d064.zip | |
am 334d9faa: Merge "Proguard: Only keep parcelables if they are used." into studio-1.4-dev automerge: 833246f automerge: 014287c
* commit '334d9faa135ae4683ba2e4e4c6c53b7b4bcbc74d':
Proguard: Only keep parcelables if they are used.
| -rw-r--r-- | files/proguard-android-optimize.txt | 4 | ||||
| -rw-r--r-- | files/proguard-android.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/files/proguard-android-optimize.txt b/files/proguard-android-optimize.txt index f8f5bcbc7..3e671f7a6 100644 --- a/files/proguard-android-optimize.txt +++ b/files/proguard-android-optimize.txt @@ -50,8 +50,8 @@ public static ** valueOf(java.lang.String); } --keep class * implements android.os.Parcelable { - public static final android.os.Parcelable$Creator *; +-keepclassmembers class * implements android.os.Parcelable { + public static final android.os.Parcelable$Creator CREATOR; } -keepclassmembers class **.R$* { diff --git a/files/proguard-android.txt b/files/proguard-android.txt index fe73baeb5..5f254934d 100644 --- a/files/proguard-android.txt +++ b/files/proguard-android.txt @@ -43,8 +43,8 @@ public static ** valueOf(java.lang.String); } --keep class * implements android.os.Parcelable { - public static final android.os.Parcelable$Creator *; +-keepclassmembers class * implements android.os.Parcelable { + public static final android.os.Parcelable$Creator CREATOR; } -keepclassmembers class **.R$* { |