Merge "Suppress known proguard notes/warnings" into studio-master-dev
diff --git a/files/proguard-android-optimize.txt b/files/proguard-android-optimize.txt
index 3e671f7..44c351e 100644
--- a/files/proguard-android-optimize.txt
+++ b/files/proguard-android-optimize.txt
@@ -24,24 +24,38 @@
-verbose
-keepattributes *Annotation*
+
-keep public class com.google.vending.licensing.ILicensingService
+-dontnote com.google.vending.licensing.ILicensingService
+
-keep public class com.android.vending.licensing.ILicensingService
+-dontnote com.android.vending.licensing.ILicensingService
# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native
-keepclasseswithmembernames class * {
native <methods>;
}
-# keep setters in Views so that animations can still work.
+# Keep setters in Views so that animations can still work.
+# Setters for listeners can still be removed.
# see http://proguard.sourceforge.net/manual/examples.html#beans
-keepclassmembers public class * extends android.view.View {
- void set*(***);
- *** get*();
+ void set*(%);
+ void set*(%, %);
+ void set*(%, %, %, %);
+ void set*(%[]);
+ void set*(**[]);
+ void set*(!**Listener);
+
+ % get*();
+ %[] get*();
+ **[] get*();
+ !**Listener get*();
}
-# We want to keep methods in Activity that could be used in the XML attribute onClick
+# We want to keep methods in Activity that could be used in the XML attribute onClick.
-keepclassmembers class * extends android.app.Activity {
- public void *(android.view.View);
+ public void *(android.view.View);
}
# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations
@@ -51,14 +65,15 @@
}
-keepclassmembers class * implements android.os.Parcelable {
- public static final android.os.Parcelable$Creator CREATOR;
+ public static final android.os.Parcelable$Creator CREATOR;
}
-keepclassmembers class **.R$* {
public static <fields>;
}
-# The support library contains references to newer platform versions.
+# The support libraries contains references to newer platform versions.
# Don't warn about those in case this app is linking against an older
-# platform version. We know about them, and they are safe.
+# platform version. We know about them, and they are safe.
+-dontnote android.support.**
-dontwarn android.support.**
diff --git a/files/proguard-android.txt b/files/proguard-android.txt
index 5f25493..f422fb8 100644
--- a/files/proguard-android.txt
+++ b/files/proguard-android.txt
@@ -17,24 +17,38 @@
# project.properties file.
-keepattributes *Annotation*
+
-keep public class com.google.vending.licensing.ILicensingService
+-dontnote com.google.vending.licensing.ILicensingService
+
-keep public class com.android.vending.licensing.ILicensingService
+-dontnote com.android.vending.licensing.ILicensingService
# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native
-keepclasseswithmembernames class * {
native <methods>;
}
-# keep setters in Views so that animations can still work.
+# Keep setters in Views so that animations can still work.
+# Setters for listeners can still be removed.
# see http://proguard.sourceforge.net/manual/examples.html#beans
-keepclassmembers public class * extends android.view.View {
- void set*(***);
- *** get*();
+ void set*(%);
+ void set*(%, %);
+ void set*(%, %, %, %);
+ void set*(%[]);
+ void set*(**[]);
+ void set*(!**Listener);
+
+ % get*();
+ %[] get*();
+ **[] get*();
+ !**Listener get*();
}
-# We want to keep methods in Activity that could be used in the XML attribute onClick
+# We want to keep methods in Activity that could be used in the XML attribute onClick.
-keepclassmembers class * extends android.app.Activity {
- public void *(android.view.View);
+ public void *(android.view.View);
}
# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations
@@ -44,14 +58,15 @@
}
-keepclassmembers class * implements android.os.Parcelable {
- public static final android.os.Parcelable$Creator CREATOR;
+ public static final android.os.Parcelable$Creator CREATOR;
}
-keepclassmembers class **.R$* {
public static <fields>;
}
-# The support library contains references to newer platform versions.
+# The support libraries contains references to newer platform versions.
# Don't warn about those in case this app is linking against an older
-# platform version. We know about them, and they are safe.
+# platform version. We know about them, and they are safe.
+-dontnote android.support.**
-dontwarn android.support.**
