diff --git a/build.gradle b/build.gradle index 0d4641a6c..b76079b42 100644 --- a/build.gradle +++ b/build.gradle @@ -98,14 +98,7 @@ android { buildTypes { release { - runProguard true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt' - zipAlign true - } - debug { - runProguard true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt' - zipAlign true + runProguard false } } diff --git a/proguard-project.txt b/proguard-project.txt deleted file mode 100644 index ee27e6b38..000000000 --- a/proguard-project.txt +++ /dev/null @@ -1,29 +0,0 @@ --dontobfuscate --dontwarn javax.naming.** --dontnote android.support.** --dontnote **ILicensingService - -# This increases the size of the .apk by ~800kb, which is clearly -# undesirable. However, the nature of the Java security suite -# implementations are that they use a lot of reflection to instantiate -# classes. The end result is that proguard excludes classes which -# may be required, depending on the security algorithms required -# by certain certificates. -# Reference: https://gitlab.com/fdroid/fdroidclient/issues/88 --keep class org.spongycastle.** --keep interface org.spongycastle.** - -# This keeps class members used for SystemInstaller IPC. -# Reference: https://gitlab.com/fdroid/fdroidclient/issues/79 --keepclassmembers class * implements android.os.IInterface { - public *; -} - -# There is a bug where the android.support.widget.SearchView gets -# removed by proguard which causes breakage. This prevents that -# from occuring by a bit of a brute force approach. While it would -# be possible to keep only the class in question, this may leave -# us open to other bugs in the future. Better to be safe than sorry. -# http://stackoverflow.com/questions/22136032/action-bar-search-view-android-null-error --keep class android.support.** { *; } --keep interface android.support.** { *; } diff --git a/project.properties b/project.properties index 41cb681d3..4846e7900 100644 --- a/project.properties +++ b/project.properties @@ -1,5 +1,3 @@ -proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - target=android-19 android.library.reference.1=extern/UniversalImageLoader/library