Re-enable ":compiler:android-tests" module

compiler/android-tests/build.gradle.kts

@@ -24,7 +24,6 @@ dependencies {
     testApi(projectTests(":compiler:tests-compiler-utils"))
     testApi(projectTests(":compiler:tests-common-new"))
 
-    testCompile(projectTests(":jps-plugin"))
     testCompile(commonDep("junit:junit"))
 
     testCompile(intellijDep()) { includeJars("util", "idea", "idea_rt", rootProject = rootProject) }
@@ -34,6 +33,8 @@ dependencies {
     testCompile(jpsStandalone()) { includeJars("jps-model") }
     testCompile(jpsBuildTest())
 
+    testRuntimeOnly(compile(intellijCoreDep()) { includeJars("intellij-core") })
+
     testCompile("org.junit.platform:junit-platform-launcher:${commonVer("org.junit.platform", "")}")
 }
 

settings.gradle

@@ -476,7 +476,6 @@ if (!buildProperties.getBoolean("disableKotlinPluginModules", false) && attached
             ":idea:idea-frontend-fir:fir-low-level-api-ide-impl",
             ":idea:idea-fir-performance-tests",
             ":plugins:lint", // TODO will this module be removed with other IDE modules?
-            ":compiler:android-tests", // TODO will this module be removed with other IDE modules?
             ":plugins:android-extensions-ide", // TODO will this module be removed with other IDE modules?
             ":prepare:ide-lazy-resolver", // TODO will this module be removed with other IDE modules?
             ":prepare:idea-plugin", // TODO will this module be removed with other IDE modules?
@@ -549,6 +548,7 @@ if (buildProperties.inJpsBuildIdeaSync) {
     project(':kotlin-test:kotlin-test-js-ir').projectDir = "$rootDir/libraries/kotlin.test/js-ir" as File
     project(':kotlin-test:kotlin-test-js:kotlin-test-js-it').projectDir = "$rootDir/libraries/kotlin.test/js/it" as File
 }
+include ":compiler:android-tests"
 
 rootProject.name = "kotlin"