From 655b04a60b3fff8ff426e095bc0a7035e2518bb6 Mon Sep 17 00:00:00 2001
From: max-klaus <max.klaus@osmand.net>
Date: Wed, 11 Sep 2019 21:20:38 +0300
Subject: [PATCH] Try to fix build

---
 OsmAnd/build.gradle | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index f7da7c19db..59784c8cdf 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -362,7 +362,8 @@ task collectExternalResources {
 			updateNoTranslate,
 			validateTranslate,
 			copyWidgetIcons,
-			downloadWorldMiniBasemap
+			downloadWorldMiniBasemap,
+			downloadPrebuiltHuaweiDrm
 }
 
 // Legacy core build
@@ -410,6 +411,8 @@ task cleanupDuplicatesInCore() {
 }
 afterEvaluate {
 	android.applicationVariants.all { variant ->
+		variant.javaCompiler.dependsOn(collectExternalResources, buildOsmAndCore, cleanupDuplicatesInCore)
+
 		// Use Drm strings only for huawei flavor
 		if ("huawei" == variant.productFlavors[0].name) {
 			variant.javaCompiler.dependsOn downloadPrebuiltHuaweiDrm
@@ -418,7 +421,6 @@ afterEvaluate {
 			variant.javaCompiler.dependsOn cleanPrebuiltHuaweiDrm
 			variant.preBuild.dependsOn cleanPrebuiltHuaweiDrm
 		}
-		variant.javaCompiler.dependsOn(downloadPrebuiltHuaweiDrm, collectExternalResources, buildOsmAndCore, cleanupDuplicatesInCore)
 	}
 }