Replace android sdk dependencies with custom project build, cleanup update_dependencies.xml

libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle

@@ -7,6 +7,10 @@ repositories {
     jcenter()
 }
 
+configurations {
+    androidSdk
+}
+
 dependencies {
     testCompile project(':kotlin-gradle-plugin')
     testCompile project(':kotlin-gradle-plugin').sourceSets.test.output
@@ -25,6 +29,8 @@ dependencies {
     testCompile gradleApi()
 
     testRuntime project(path: ':kotlin-android-extensions', configuration: 'runtimeJar')
+
+    androidSdk project(path: ":custom-dependencies:android-sdk", configuration: "androidSdk")
 }
 
 // Include Gradle task properties validation into the testing procedure:
@@ -81,6 +87,7 @@ tasks.withType(Test) {
     if (mavenLocalRepo != null) {
         systemProperty("maven.repo.local", mavenLocalRepo)
     }
+    systemProperty("android.sdk", project.configurations["androidSdk"].singleFile.getCanonicalPath())
 
     testLogging {
         // set options for log level LIFECYCLE

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt

@@ -5,6 +5,7 @@ import org.jetbrains.kotlin.gradle.util.getFileByName
 import org.jetbrains.kotlin.gradle.util.getFilesByNames
 import org.jetbrains.kotlin.gradle.util.isLegacyAndroidGradleVersion
 import org.jetbrains.kotlin.gradle.util.modify
+import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.junit.Test
 import java.io.File
 
@@ -41,15 +42,13 @@ class KotlinAndroid30GradleIT : AbstractKotlinAndroidGradleTests(gradleVersion =
     }
 }
 
-const val ANDROID_HOME_PATH = "../../../dependencies/androidSDK"
-
 abstract class AbstractKotlinAndroidGradleTests(
         protected val gradleVersion: String,
         private val androidGradlePluginVersion: String
 ) : BaseGradleIT() {
 
     override fun defaultBuildOptions() =
-            super.defaultBuildOptions().copy(androidHome = File(ANDROID_HOME_PATH),
+            super.defaultBuildOptions().copy(androidHome = KotlinTestUtils.findAndroidSdk(),
                                              androidGradlePluginVersion = androidGradlePluginVersion)
 
     @Test
@@ -301,7 +300,7 @@ abstract class AbstractKotlinAndroidWithJackGradleTests(
     fun getEnvJDK_18() = System.getenv()["JDK_18"]
 
     override fun defaultBuildOptions() =
-            super.defaultBuildOptions().copy(androidHome = File(ANDROID_HOME_PATH),
+            super.defaultBuildOptions().copy(androidHome = KotlinTestUtils.findAndroidSdk(),
                     androidGradlePluginVersion = androidGradlePluginVersion, javaHome = File(getEnvJDK_18()))
 
     @Test

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt

@@ -4,6 +4,7 @@ import org.jetbrains.kotlin.gradle.util.allKotlinFiles
 import org.jetbrains.kotlin.gradle.util.getFileByName
 import org.jetbrains.kotlin.gradle.util.getFilesByNames
 import org.jetbrains.kotlin.gradle.util.modify
+import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.junit.Test
 import java.io.File
 
@@ -15,9 +16,9 @@ class IncrementalCompilationMultiProjectIT : BaseGradleIT() {
 
     private fun androidBuildOptions() =
             BuildOptions(withDaemon = true,
-                    androidHome = File(ANDROID_HOME_PATH),
-                    androidGradlePluginVersion = ANDROID_GRADLE_PLUGIN_VERSION,
-                    incremental = true)
+                         androidHome = KotlinTestUtils.findAndroidSdk(),
+                         androidGradlePluginVersion = ANDROID_GRADLE_PLUGIN_VERSION,
+                         incremental = true)
 
     override fun defaultBuildOptions(): BuildOptions =
             super.defaultBuildOptions().copy(withDaemon = true, incremental = true)

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt

@@ -1,6 +1,7 @@
 package org.jetbrains.kotlin.gradle
 
 import org.jetbrains.kotlin.gradle.util.isLegacyAndroidGradleVersion
+import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.junit.Test
 import java.io.File
 
@@ -19,9 +20,9 @@ open class Kapt3AndroidIT : Kapt3BaseIT() {
 
     private fun androidBuildOptions() =
             BuildOptions(withDaemon = true,
-                    androidHome = File(ANDROID_HOME_PATH),
-                    androidGradlePluginVersion = androidGradlePluginVersion,
-                    freeCommandLineArgs = listOf("-Pkapt.verbose=true"))
+                         androidHome = KotlinTestUtils.findAndroidSdk(),
+                         androidGradlePluginVersion = androidGradlePluginVersion,
+                         freeCommandLineArgs = listOf("-Pkapt.verbose=true"))
 
     override fun defaultBuildOptions() = androidBuildOptions()