Fix debug build

This resolves #584
This commit is contained in:
solohsu 2020-07-30 15:54:05 +08:00
parent 1d60bb9d46
commit e4f24e4674
3 changed files with 15 additions and 9 deletions

View File

@ -12,7 +12,7 @@ android {
targetSdkVersion 28 targetSdkVersion 28
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
multiDexEnabled true multiDexEnabled false
} }
buildTypes { buildTypes {
@ -62,8 +62,10 @@ afterEvaluate {
task("makeAndCopy${variantNameCapped}", type: Jar, dependsOn: "assemble${variantNameCapped}") { task("makeAndCopy${variantNameCapped}", type: Jar, dependsOn: "assemble${variantNameCapped}") {
dependsOn tasks.getByPath(":edxp-common:copyCommonProperties") dependsOn tasks.getByPath(":edxp-common:copyCommonProperties")
from "${buildDir}/intermediates/transforms/dexMerger/${variantNameLowered}/0/", def dexOutPath = variant.name.contains("release") ?
"${projectDir}/src/main/resources/" "${buildDir}/intermediates/transforms/dexMerger/${variantNameLowered}/0/" :
"${buildDir}/intermediates/dex/${variantNameLowered}/mergeDex${variantNameCapped}/out/"
from dexOutPath, "${projectDir}/src/main/resources/"
destinationDir file(myTemplatePath + "system/framework/") destinationDir file(myTemplatePath + "system/framework/")
baseName "edxp" baseName "edxp"
doLast { doLast {

View File

@ -12,7 +12,7 @@ android {
targetSdkVersion 28 targetSdkVersion 28
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
multiDexEnabled true multiDexEnabled false
} }
buildTypes { buildTypes {
@ -61,8 +61,10 @@ afterEvaluate {
task("makeAndCopy${variantNameCapped}", type: Jar, dependsOn: "assemble${variantNameCapped}") { task("makeAndCopy${variantNameCapped}", type: Jar, dependsOn: "assemble${variantNameCapped}") {
dependsOn tasks.getByPath(":edxp-common:copyCommonProperties") dependsOn tasks.getByPath(":edxp-common:copyCommonProperties")
from "${buildDir}/intermediates/transforms/dexMerger/${variantNameLowered}/0/", def dexOutPath = variant.name.contains("release") ?
"${projectDir}/src/main/resources/" "${buildDir}/intermediates/transforms/dexMerger/${variantNameLowered}/0/" :
"${buildDir}/intermediates/dex/${variantNameLowered}/mergeDex${variantNameCapped}/out/"
from dexOutPath, "${projectDir}/src/main/resources/"
destinationDir file(myTemplatePath + "system/framework/") destinationDir file(myTemplatePath + "system/framework/")
baseName "edxp" baseName "edxp"
doLast { doLast {

View File

@ -12,7 +12,7 @@ android {
targetSdkVersion 28 targetSdkVersion 28
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
multiDexEnabled true multiDexEnabled false
} }
buildTypes { buildTypes {
@ -61,8 +61,10 @@ afterEvaluate {
task("makeAndCopy${variantNameCapped}", type: Jar, dependsOn: "assemble${variantNameCapped}") { task("makeAndCopy${variantNameCapped}", type: Jar, dependsOn: "assemble${variantNameCapped}") {
dependsOn tasks.getByPath(":edxp-common:copyCommonProperties") dependsOn tasks.getByPath(":edxp-common:copyCommonProperties")
from "${buildDir}/intermediates/transforms/dexMerger/${variantNameLowered}/0/", def dexOutPath = variant.name.contains("release") ?
"${projectDir}/src/main/resources/" "${buildDir}/intermediates/transforms/dexMerger/${variantNameLowered}/0/" :
"${buildDir}/intermediates/dex/${variantNameLowered}/mergeDex${variantNameCapped}/out/"
from dexOutPath, "${projectDir}/src/main/resources/"
destinationDir file(myTemplatePath + "system/framework/") destinationDir file(myTemplatePath + "system/framework/")
baseName "edxp" baseName "edxp"
doLast { doLast {