From 9459f8113f683cd09ba30dd256f9e4f9d4157aa2 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Fri, 29 Jan 2021 07:47:08 +0100 Subject: [PATCH] Set ANDROID_HOME/ANDROID_SDK_ROOT for android box tests In some cases emulator execution on TC fails cause of problem with pathes --- .../org/jetbrains/kotlin/android/tests/emulator/Emulator.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/emulator/Emulator.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/emulator/Emulator.java index 79fe6e5b066..5524656a3b9 100644 --- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/emulator/Emulator.java +++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/emulator/Emulator.java @@ -144,6 +144,10 @@ public class Emulator { bootCheckCommand.addParameter("shell"); bootCheckCommand.addParameter("getprop"); bootCheckCommand.addParameter("sys.boot_completed"); + System.out.println("Setting ANDROID_HOME/ANDROID_SDK_ROOT:" + pathManager.getAndroidSdkRoot()); + bootCheckCommand.withEnvironment("ANDROID_SDK_ROOT", pathManager.getAndroidSdkRoot()); + bootCheckCommand.withEnvironment("ANDROID_HOME", pathManager.getAndroidSdkRoot()); + int counter = 0; RunResult execute = RunUtils.execute(bootCheckCommand); while (counter < 20) {