Browse Source

fixed creating certificates.zip when target zip did not include the directory certificates, so they were bein unpacked into datadir. Added entryCompression ZipEntryCompression.STORED since final APK is being compressed as well. Put all custom tasks under android plugin definitions

pull/1064/head^2
unlnown542a 7 years ago
parent
commit
cf5081d300
  1. 20
      android/build.gradle
  2. 1
      android/gradle.properties

20
android/build.gradle

@ -8,11 +8,6 @@ buildscript {
} }
} }
task clean(type: Delete,overwrite: true) {
delete 'build'
delete 'assets'
}
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
@ -23,7 +18,7 @@ android {
targetSdkVersion 25 targetSdkVersion 25
minSdkVersion 14 minSdkVersion 14
versionCode 1 versionCode 1
versionName "2.17.2c" versionName "2.17.2e"
} }
sourceSets { sourceSets {
main { main {
@ -52,9 +47,16 @@ android {
} }
task zipCerts(type:Zip) { task zipCerts(type:Zip) {
archiveName 'certificates.zip' from (files('../contrib/'))
include 'certificates/**/*.crt'
destinationDir file('assets') destinationDir file('assets')
from (files('../contrib/certificates')) archiveName 'certificates.zip'
entryCompression ZipEntryCompression.STORED
} }
preBuild.dependsOn zipCerts preBuild.dependsOn zipCerts
task clean(type: Delete,overwrite: true) {
delete 'build'
delete 'assets'
}

1
android/gradle.properties

@ -0,0 +1 @@
org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
Loading…
Cancel
Save