diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index cda2320cc8..a10705510c 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -410,8 +410,6 @@ 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
@@ -420,6 +418,7 @@ afterEvaluate {
 			variant.javaCompiler.dependsOn cleanPrebuiltHuaweiDrm
 			variant.preBuild.dependsOn cleanPrebuiltHuaweiDrm
 		}
+		variant.javaCompiler.dependsOn(collectExternalResources, buildOsmAndCore, cleanupDuplicatesInCore)
 	}
 }