fixup! [Build] Make :compiler:android-tests:test tests cacheable
diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/AndroidRunner.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/AndroidRunner.java index 3d4b9c6..474e7ad 100644 --- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/AndroidRunner.java +++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/AndroidRunner.java
@@ -42,7 +42,7 @@ .toFile(); System.out.println("Created temporary folder for running android tests: " + tmpFolder.getAbsolutePath()); File rootFolder = new File(""); - pathManager = new PathManager(rootFolder.getAbsolutePath(), tmpFolder.getAbsolutePath()); + pathManager = new PathManager(tmpFolder.getAbsolutePath()); } return pathManager; }
diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt index c7fbb51..b78cba0 100644 --- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt +++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt
@@ -477,7 +477,7 @@ val tmpFolder = createTempDirectory().toAbsolutePath().toString() println("Created temporary folder for android tests: $tmpFolder") val rootFolder = Path("").toAbsolutePath().toString() - val pathManager = PathManager(rootFolder, tmpFolder) + val pathManager = PathManager(tmpFolder) generate(pathManager, true) println("Android test project is generated into $tmpFolder folder") }
diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/PathManager.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/PathManager.java index fa5ae11..4ecc5e4 100644 --- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/PathManager.java +++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/PathManager.java
@@ -19,20 +19,13 @@ import org.jetbrains.kotlin.test.util.KtTestUtil; import java.io.File; -import java.nio.file.Paths; public class PathManager { private final String tmpFolder; - private final String androidTestsRootFolder; - public PathManager(String androidTestsRootFolder, String tmpFolder) { + public PathManager(String tmpFolder) { this.tmpFolder = tmpFolder; - this.androidTestsRootFolder = androidTestsRootFolder; - } - - public String getPlatformFolderInAndroidSdk() { - return getAndroidSdkRoot() + "/platforms"; } public String getAndroidAvdRoot() { @@ -65,10 +58,6 @@ return tmpFolder + "/src"; } - public String getAndroidTmpFolder() { - return tmpFolder; - } - public String getAndroidSdkRoot() { return KtTestUtil.getAndroidSdkSystemIndependentPath(); }