Try to fix build

This commit is contained in:
max-klaus 2019-09-11 21:20:38 +03:00
parent fae21cbdf3
commit ad4fa9c500

View file

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