diff options
| author | Ying Wang <wangying@google.com> | 2013-05-31 15:24:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-31 15:24:56 +0000 |
| commit | 8216f3228fbe5343b38e19f51fb91584946024cc (patch) | |
| tree | e7948e990d227dbae2352a238a9989e5e95d4d1b | |
| parent | 1e18897689aff8eaf2907dba8f3141da4210f91a (diff) | |
| parent | 1b28087a58b3e05f4353a1011cff85b26f64724f (diff) | |
| download | build-8216f3228fbe5343b38e19f51fb91584946024cc.zip build-8216f3228fbe5343b38e19f51fb91584946024cc.tar.gz build-8216f3228fbe5343b38e19f51fb91584946024cc.tar.bz2 | |
Merge "Tweak proguard flags in the 2 files."
| -rw-r--r-- | core/proguard.flags | 16 | ||||
| -rw-r--r-- | core/proguard_basic_keeps.flags | 18 |
2 files changed, 17 insertions, 17 deletions
diff --git a/core/proguard.flags b/core/proguard.flags index d8ad3bd..1e3951b 100644 --- a/core/proguard.flags +++ b/core/proguard.flags @@ -1,11 +1,3 @@ -# see http://sourceforge.net/tracker/?func=detail&aid=2787465&group_id=54750&atid=474707 --optimizations !code/simplification/arithmetic --optimizations !code/simplification/cast --allowaccessmodification - -# To prevent name conflict in incremental obfuscation. --useuniqueclassmembernames - # dex does not like code run through proguard optimize and preverify steps. -dontoptimize -dontpreverify @@ -16,8 +8,10 @@ # Add this flag in your package's own configuration if it's needed. #-flattenpackagehierarchy -# Some classes in the libraries extend package private classes to chare common functionality -# that isn't explicitly part of the API --dontskipnonpubliclibraryclasses -dontskipnonpubliclibraryclassmembers +# Keep classes and methods that have the guava @VisibleForTesting annotation +-keep @com.google.common.annotations.VisibleForTesting class * +-keepclassmembers class * { +@com.google.common.annotations.VisibleForTesting *; +} -include proguard_basic_keeps.flags diff --git a/core/proguard_basic_keeps.flags b/core/proguard_basic_keeps.flags index 049ce88..0ce81ef 100644 --- a/core/proguard_basic_keeps.flags +++ b/core/proguard_basic_keeps.flags @@ -1,3 +1,15 @@ +# see http://sourceforge.net/tracker/?func=detail&aid=2787465&group_id=54750&atid=474707 +-optimizations !code/simplification/arithmetic +-optimizations !code/simplification/cast +-allowaccessmodification + +# To prevent name conflict in incremental obfuscation. +-useuniqueclassmembernames + +# Some classes in the libraries extend package private classes to chare common functionality +# that isn't explicitly part of the API +-dontskipnonpubliclibraryclasses -dontskipnonpubliclibraryclassmembers + # For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations -keepclassmembers enum * { public static **[] values(); @@ -16,12 +28,6 @@ java.lang.Class class$(java.lang.String, boolean); } -# Keep classes and methods that have the guava @VisibleForTesting annotation --keep @com.google.common.annotations.VisibleForTesting class * --keepclassmembers class * { -@com.google.common.annotations.VisibleForTesting *; -} - # Keep serializable classes and necessary members for serializable classes # Copied from the ProGuard manual at http://proguard.sourceforge.net. -keepnames class * implements java.io.Serializable |