From 1f84ff7fa6b823777a6274e854a28f0efb554e9c Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Sun, 24 Apr 2016 17:32:35 +0300 Subject: [PATCH] Writing android sdk to local.properties --- .../kotlin/android/tests/AndroidRunner.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) 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 a2ba78eff95..acc927842b1 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 @@ -22,6 +22,8 @@ import junit.framework.TestSuite; import org.jetbrains.annotations.NotNull; import java.io.File; +import java.io.FileWriter; +import java.io.IOException; public class AndroidRunner extends TestSuite { @@ -42,7 +44,8 @@ public class AndroidRunner extends TestSuite { PathManager pathManager = getPathManager(); FileUtil.copyDir(new File(pathManager.getAndroidModuleRoot()), new File(pathManager.getTmpFolder())); - + writeAndroidSkdToLocalProperties(); + CodegenTestsOnAndroidGenerator.generate(pathManager); System.out.println("Run tests on android..."); @@ -55,4 +58,15 @@ public class AndroidRunner extends TestSuite { // Clear tmp folder where we run android tests FileUtil.delete(new File(pathManager.getTmpFolder())); } + + private static void writeAndroidSkdToLocalProperties() throws IOException { + System.out.println("Writing android sdk to local.properties: " + pathManager.getAndroidSdkRoot()); + File file = new File(pathManager.getTmpFolder() + "/local.properties"); + FileWriter fw = new FileWriter(file); + try { + fw.write("sdk.dir=" + pathManager.getAndroidSdkRoot()); + } finally { + fw.close(); + } + } }