Fix debug build

This resolves #584
ElderDrivers · Jul 30, 2020 · e4f24e4 · e4f24e4
1 parent 1d60bb9
commit e4f24e4
Show file tree

Hide file tree

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

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

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