diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index 0aef4aa139..1232b9661f 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -542,6 +542,5 @@ dependencies {
 	}
 	implementation 'com.jaredrummler:colorpicker:1.1.0'
 
-	//freehuaweiImplementation 'com.huawei.agconnect:agconnect-core:1.4.1.300'
 	freehuaweiImplementation 'com.huawei.hms:iap:5.0.2.300'
 }
diff --git a/build.gradle b/build.gradle
index 1cd0b221b4..e75ca7d5b8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,6 +4,14 @@ buildscript {
         google()
         mavenCentral()
         jcenter()
+        maven {
+            url 'https://developer.huawei.com/repo/'
+            content {
+                includeGroup 'com.huawei.agconnect'
+                includeGroup 'com.huawei.hms'
+                includeGroup 'com.huawei.hmf'
+            }
+        }
     }
     dependencies {
         //classpath 'com.android.tools.build:gradle:2.+'
@@ -11,6 +19,9 @@ buildscript {
         classpath 'com.google.gms:google-services:3.0.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        if (gradle.startParameter.taskNames.toString().contains("huawei")) {
+            classpath 'com.huawei.agconnect:agcp:1.4.1.300'
+        }
     }
 }
 
@@ -32,5 +43,13 @@ allprojects {
         maven {
             url "https://jitpack.io"
         }
+        maven {
+            url 'https://developer.huawei.com/repo/'
+            content {
+                includeGroup 'com.huawei.agconnect'
+                includeGroup 'com.huawei.hms'
+                includeGroup 'com.huawei.hmf'
+            }
+        }
     }
 }