Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
e172ad8cc7
2 changed files with 37 additions and 31 deletions
|
@ -141,15 +141,15 @@ android {
|
|||
|
||||
buildTypes {
|
||||
debug {
|
||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
|
||||
// proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
|
||||
minifyEnabled true
|
||||
// proguardFiles 'proguard-project.txt'
|
||||
proguardFiles 'proguard-project.txt'
|
||||
signingConfig signingConfigs.development
|
||||
}
|
||||
release {
|
||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
|
||||
// proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
|
||||
minifyEnabled true
|
||||
// proguardFiles 'proguard-project.txt'
|
||||
proguardFiles 'proguard-project.txt'
|
||||
signingConfig signingConfigs.publishing
|
||||
}
|
||||
}
|
||||
|
|
|
@ -7,32 +7,38 @@
|
|||
# Allow obfuscation of android.support.v7.internal.view.menu.**
|
||||
# to avoid problem on Samsung 4.2.2 devices with appcompat v21
|
||||
# see https://code.google.com/p/android/issues/detail?id=78377
|
||||
-dontshrink
|
||||
-dontoptimize
|
||||
-keepattributes **
|
||||
-keep class !android.support.v7.internal.view.menu.**,** {*;}
|
||||
-keep interface ** { *; }
|
||||
-keep enum ** { *; }
|
||||
-dontpreverify
|
||||
-verbose
|
||||
-keep class !android.support.v7.internal.view.menu.**,android.support.** {*;}
|
||||
-keep class net.osmand.** { *; }
|
||||
-keep interface net.osmand.** { *; }
|
||||
|
||||
-keep class com.** { *; }
|
||||
-keep interface com.** { *; }
|
||||
|
||||
-keep class net.** { *; }
|
||||
-keep interface net.** { *; }
|
||||
|
||||
-keep class gnu.** { *; }
|
||||
-keep interface gnu.** { *; }
|
||||
|
||||
-keep class org.** { *; }
|
||||
-keep interface org.** { *; }
|
||||
|
||||
-keep class bsh.** { *; }
|
||||
-keep interface bsh.** { *; }
|
||||
|
||||
-keep class btools.** { *; }
|
||||
-keep interface btools.** { *; }
|
||||
|
||||
-keep class alice.** { *; }
|
||||
-keep interface alice.** { *; }
|
||||
-dontoptimize
|
||||
-dontshrink
|
||||
-dontwarn alice.**
|
||||
-verbose
|
||||
|
||||
#-keep class !android.support.v7.internal.view.menu.**,android.support.** {*;}
|
||||
#-keep class net.osmand.** { *; }
|
||||
#-keep interface net.osmand.** { *; }
|
||||
#
|
||||
#-keep class com.** { *; }
|
||||
#-keep interface com.** { *; }
|
||||
#
|
||||
#-keep class net.** { *; }
|
||||
#-keep interface net.** { *; }
|
||||
#
|
||||
#-keep class gnu.** { *; }
|
||||
#-keep interface gnu.** { *; }
|
||||
#
|
||||
#-keep class org.** { *; }
|
||||
#-keep interface org.** { *; }
|
||||
#
|
||||
#-keep class bsh.** { *; }
|
||||
#-keep interface bsh.** { *; }
|
||||
#
|
||||
#-keep class btools.** { *; }
|
||||
#-keep interface btools.** { *; }
|
||||
#
|
||||
#-keep class alice.** { *; }
|
||||
#-keep interface alice.** { *; }
|
||||
#-dontwarn alice.**
|
||||
|
|
Loading…
Reference in a new issue