diff --git a/BlurBenchmark/build.gradle b/BlurBenchmark/build.gradle index 5482258..b3c6f25 100644 --- a/BlurBenchmark/build.gradle +++ b/BlurBenchmark/build.gradle @@ -45,14 +45,11 @@ android { debug { applicationIdSuffix '.debug' minifyEnabled false - proguardFiles getDefaultProguardFile("proguard-android-optimize.txt") - proguardFiles 'proguard-rules.txt' //jniDebuggable true } release { minifyEnabled true - proguardFiles getDefaultProguardFile("proguard-android-optimize.txt") - proguardFiles 'proguard-rules.txt' + proguardFiles getDefaultProguardFile("proguard-android.txt"), 'proguard-rules.pro' signingConfig signingConfigs.release } } diff --git a/BlurBenchmark/proguard-rules.txt b/BlurBenchmark/proguard-rules.pro similarity index 62% rename from BlurBenchmark/proguard-rules.txt rename to BlurBenchmark/proguard-rules.pro index af3036a..1e5cf34 100644 --- a/BlurBenchmark/proguard-rules.txt +++ b/BlurBenchmark/proguard-rules.pro @@ -16,17 +16,6 @@ # public *; #} --keepattributes EnclosingMethod, Signature - -#Keep classes that are referenced on the AndroidManifest --keepnames public class * extends android.app.Activity --keep public class * extends android.app.Application --keep public class * extends android.app.Service --keep public class * extends android.content.BroadcastReceiver --keep public class * extends android.content.ContentProvider --keep public class com.android.vending.licensing.ILicensingService - --keep class !android.support.v7.internal.view.menu.*MenuBuilder*, android.support.v7.** { *; } #keep jackson -keepnames class com.fasterxml.jackson.** { *; } @@ -42,14 +31,10 @@ -dontwarn com.squareup.okhttp.** #keep renderscript --keepclasseswithmembers class androidx.renderscript.** { +-keep class androidx.renderscript.** { native ; } -#keep systembartint --keep class com.readystatesoftware.** { *; } --keep interface com.readystatesoftware.** { *; } - -keep class at.favre.app.blurbenchmark.models.** {*;} -keep class at.favre.app.blurbenchmark.blur.** {*;} @@ -62,7 +47,4 @@ public static int d(...); } --keep class android.support.design.widget.AppBarLayout {*;} --keep class android.support.design.widget.AppBarLayout$* {*;} - -keep public class at.favre.app.blurbenchmark.BuildConfig {public static *;}