Include a default proguard config file with optimization
Adds a new proguard-android-optimize.txt file alongside the
default proguard-android.txt file in tools/proguard/ which
project.properties files can point to. The shrinking rules
are the same, but unlike proguard-android.txt, the new config
file leave optimization enabled. This allows users to point
to a tool-managed proguard file rather than forking the
default file in order to edit out the -dontoptimize flag.
Change-Id: I2f0fc8361e3964843a4cafe4f4087a6dee68b5ce
diff --git a/files/proguard-android.txt b/files/proguard-android.txt
index 3cc5c8a..fe73bae 100644
--- a/files/proguard-android.txt
+++ b/files/proguard-android.txt
@@ -10,18 +10,11 @@
# of these optimizations on its own).
-dontoptimize
-dontpreverify
-
-# If you want to enable optimization, you should include the
-# following:
-# -optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/*
-# -optimizationpasses 5
-# -allowaccessmodification
-#
-# Note that you cannot just include these flags in your own
-# configuration file; if you are including this file, optimization
-# will be turned off. You'll need to either edit this file, or
-# duplicate the contents of this file and remove the include of this
-# file from your project's proguard.config path property.
+# Note that if you want to enable optimization, you cannot just
+# include optimization flags in your own project configuration file;
+# instead you will need to point to the
+# "proguard-android-optimize.txt" file instead of this one from your
+# project.properties file.
-keepattributes *Annotation*
-keep public class com.google.vending.licensing.ILicensingService