azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set ANDROID_SDK_ROOT for android box tests

Browse Source
This commit is contained in:
Mikhael Bogdanov
2021-01-29 14:29:19 +01:00
parent 4a50dc9074
commit 3e1fabd46c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/emulator/Emulator.java
+5 -5
View File
@@ -121,8 +121,11 @@ public class Emulator {
public void startEmulator() { public void startEmulator() {
startServer(); startServer();
System.out.println("Starting emulator..."); System.out.println("Starting emulator with ANDROID_HOME/ANDROID_SDK_ROOT: " + pathManager.getAndroidSdkRoot());
RunUtils.executeOnSeparateThread(new RunUtils.RunSettings(getStartCommand(), null, false, "START: ", true)); 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(); printLog();
} }
@@ -144,9 +147,6 @@ public class Emulator {
bootCheckCommand.addParameter("shell"); bootCheckCommand.addParameter("shell");
bootCheckCommand.addParameter("getprop"); bootCheckCommand.addParameter("getprop");
bootCheckCommand.addParameter("sys.boot_completed"); 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; int counter = 0;
RunResult execute = RunUtils.execute(bootCheckCommand); RunResult execute = RunUtils.execute(bootCheckCommand);