Fix failing Gradle tests

* Extract ANDROID_HOME_PATH constant
* Set ANDROID_HOME_PATH to dependencies/androidSDK
* Running download_android_sdk.xml is now needed to run Gradle Integration Tests
* Modify download_android_sdk.xml so that tools/android is executable

(cherry picked from commit 75a6e37)

download_android_sdk.xml

@@ -128,6 +128,7 @@
                     <arg path="${android.sdk.dir}/build-tools/@{android.build.tools.version}/aidl"/>
                     <arg path="${android.sdk.dir}/build-tools/@{android.build.tools.version}/dx"/>
                     <arg path="${android.sdk.dir}/build-tools/@{android.build.tools.version}/zipalign"/>
+                    <arg path="${android.sdk.dir}/tools/android"/>
                 </exec>
             </sequential>
         </sequential>

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

@@ -10,13 +10,15 @@ class KotlinAndroidGradleCLIOnly : AbstractKotlinAndroidGradleTests(gradleVersio
 
 class KotlinAndroidWithJackGradleCLIOnly : AbstractKotlinAndroidWithJackGradleTests(gradleVersion = "3.3", androidGradlePluginVersion = "2.3.+")
 
+const val ANDROID_HOME_PATH = "../../../dependencies/androidSDK"
+
 abstract class AbstractKotlinAndroidGradleTests(
         private val gradleVersion: String,
         private val androidGradlePluginVersion: String
 ) : BaseGradleIT() {
 
     override fun defaultBuildOptions() =
-            super.defaultBuildOptions().copy(androidHome = File("../../../dependencies/android-sdk-for-tests"),
+            super.defaultBuildOptions().copy(androidHome = File(ANDROID_HOME_PATH),
                                              androidGradlePluginVersion = androidGradlePluginVersion)
 
     @Test
@@ -90,7 +92,7 @@ abstract class AbstractKotlinAndroidGradleTests(
         val project = Project("AndroidIncrementalSingleModuleProject", gradleVersion)
         val options = defaultBuildOptions().copy(incremental = true)
 
-        project.build("build", options = options) {
+        project.build("assembleDebug", options = options) {
             assertSuccessful()
         }
 
@@ -101,7 +103,7 @@ package foo
 fun getSomething() = 10
 """)
 
-        project.build("build", options = options) {
+        project.build("assembleDebug", options = options) {
             assertSuccessful()
             assertCompiledKotlinSources(listOf("app/src/main/kotlin/foo/KotlinActivity1.kt", "app/src/main/kotlin/foo/getSomething.kt"))
             assertCompiledJavaSources(listOf("app/src/main/java/foo/JavaActivity.java"), weakTesting = true)
@@ -203,7 +205,7 @@ fun getSomething() = 10
     fun testAndroidKaptChangingDependencies() {
         val project = Project("AndroidKaptChangingDependencies", gradleVersion)
 
-        project.build("build") {
+        project.build("assembleDebug") {
             assertSuccessful()
             assertNotContains("Changed dependencies of configuration .+ after it has been included in dependency resolution".toRegex())
         }
@@ -219,7 +221,7 @@ abstract class AbstractKotlinAndroidWithJackGradleTests(
     fun getEnvJDK_18() = System.getenv()["JDK_18"]
 
     override fun defaultBuildOptions() =
-            super.defaultBuildOptions().copy(androidHome = File("../../../dependencies/android-sdk-for-tests"),
+            super.defaultBuildOptions().copy(androidHome = File(ANDROID_HOME_PATH),
                     androidGradlePluginVersion = androidGradlePluginVersion, javaHome = File(getEnvJDK_18()))
 
     @Test

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

@@ -15,7 +15,7 @@ class IncrementalCompilationMultiProjectIT : BaseGradleIT() {
 
     private fun androidBuildOptions() =
             BuildOptions(withDaemon = true,
-                    androidHome = File("../../../dependencies/android-sdk-for-tests"),
+                    androidHome = File(ANDROID_HOME_PATH),
                     androidGradlePluginVersion = ANDROID_GRADLE_PLUGIN_VERSION,
                     incremental = true)
 

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

@@ -31,7 +31,7 @@ class Kapt3IT : BaseGradleIT() {
 
     private fun androidBuildOptions() =
             BuildOptions(withDaemon = true,
-                    androidHome = File("../../../dependencies/android-sdk-for-tests"),
+                    androidHome = File(ANDROID_HOME_PATH),
                     androidGradlePluginVersion = ANDROID_GRADLE_PLUGIN_VERSION,
                     freeCommandLineArgs = listOf("-Pkapt.verbose=true"))