Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f586805 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 38cdd442: Tweak proguard flags in the 2 files.

* commit '38cdd442':
  Tweak proguard flags in the 2 files.
parents 8870070d 38cdd442
Loading
Loading
Loading
Loading
+5 −11
Original line number Original line Diff line number Diff line
# 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.
# dex does not like code run through proguard optimize and preverify steps.
-dontoptimize
-dontoptimize
-dontpreverify
-dontpreverify
@@ -16,8 +8,10 @@
# Add this flag in your package's own configuration if it's needed.
# Add this flag in your package's own configuration if it's needed.
#-flattenpackagehierarchy
#-flattenpackagehierarchy


# Some classes in the libraries extend package private classes to chare common functionality
# Keep classes and methods that have the guava @VisibleForTesting annotation
# that isn't explicitly part of the API
-keep @com.google.common.annotations.VisibleForTesting class *
-dontskipnonpubliclibraryclasses -dontskipnonpubliclibraryclassmembers
-keepclassmembers class * {
@com.google.common.annotations.VisibleForTesting *;
}


-include proguard_basic_keeps.flags
-include proguard_basic_keeps.flags
+12 −6
Original line number Original line Diff line number Diff line
# 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
# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations
-keepclassmembers enum * {
-keepclassmembers enum * {
    public static **[] values();
    public static **[] values();
@@ -16,12 +28,6 @@
    java.lang.Class class$(java.lang.String, boolean);
    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
# Keep serializable classes and necessary members for serializable classes
# Copied from the ProGuard manual at http://proguard.sourceforge.net.
# Copied from the ProGuard manual at http://proguard.sourceforge.net.
-keepnames class * implements java.io.Serializable
-keepnames class * implements java.io.Serializable