From ee0995528a7afd0d4dd01a01fd4c2fa5cd7ebec2 Mon Sep 17 00:00:00 2001
From: solohsu <hsushulong@gmail.com>
Date: Tue, 23 Apr 2019 00:18:28 +0800
Subject: [PATCH] Minify all variant builds

---
 edxp-sandhook/build.gradle | 4 ++--
 edxp-whale/build.gradle    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/edxp-sandhook/build.gradle b/edxp-sandhook/build.gradle
index 9ee9c429..10c01637 100644
--- a/edxp-sandhook/build.gradle
+++ b/edxp-sandhook/build.gradle
@@ -13,7 +13,7 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
@@ -58,7 +58,7 @@ afterEvaluate {
 
         task("makeAndCopy${variantNameCapped}", type: Jar, dependsOn: "assemble${variantNameCapped}") {
             dependsOn tasks.getByPath(":edxp-common:copyCommonProperties")
-            from "${buildDir}/intermediates/dex/${variantNameLowered}/mergeDex${variantNameCapped}/out/"
+            from "${buildDir}/intermediates/transforms/dexMerger/${variantNameLowered}/0/"
             destinationDir file(myTemplatePath + "system/framework/")
             baseName "edxp"
             doLast {
diff --git a/edxp-whale/build.gradle b/edxp-whale/build.gradle
index 5f41eadd..3d8d17d1 100644
--- a/edxp-whale/build.gradle
+++ b/edxp-whale/build.gradle
@@ -13,7 +13,7 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
@@ -56,7 +56,7 @@ afterEvaluate {
 
         task("makeAndCopy${variantNameCapped}", type: Jar, dependsOn: "assemble${variantNameCapped}") {
             dependsOn tasks.getByPath(":edxp-common:copyCommonProperties")
-            from "${buildDir}/intermediates/dex/${variantNameLowered}/mergeDex${variantNameCapped}/out/"
+            from "${buildDir}/intermediates/transforms/dexMerger/${variantNameLowered}/0/"
             destinationDir file(myTemplatePath + "system/framework/")
             baseName "edxp"
             doLast {