From 3e1fabd46c5c70e0af3910f749d299821bf1a449 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Fri, 29 Jan 2021 14:29:19 +0100 Subject: [PATCH] Set ANDROID_SDK_ROOT for android box tests --- .../kotlin/android/tests/emulator/Emulator.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 5524656a3b9..d14a7cad83f 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 @@ -121,8 +121,11 @@ public class Emulator { public void startEmulator() { startServer(); - System.out.println("Starting emulator..."); - RunUtils.executeOnSeparateThread(new RunUtils.RunSettings(getStartCommand(), null, false, "START: ", true)); + System.out.println("Starting emulator with ANDROID_HOME/ANDROID_SDK_ROOT: " + pathManager.getAndroidSdkRoot()); + GeneralCommandLine startCommand = getStartCommand(); + startCommand.withEnvironment("ANDROID_SDK_ROOT", pathManager.getAndroidSdkRoot()); + startCommand.withEnvironment("ANDROID_HOME", pathManager.getAndroidSdkRoot()); + RunUtils.executeOnSeparateThread(new RunUtils.RunSettings(startCommand, null, false, "START: ", true)); printLog(); } @@ -144,9 +147,6 @@ 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);