From 0299d2c9e240161a0caa3792b3099dea46b5ab7e Mon Sep 17 00:00:00 2001 From: Bogdan Mukvich Date: Tue, 25 Apr 2023 11:24:12 +0200 Subject: [PATCH] Use JDK 8 as JAVA_HOME for android tests * android sdk tools binaries run in a child process relies on JAVA_HOME * old android sdk tools can run only under JDK 8, requiring javax libs --- compiler/android-tests/build.gradle.kts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compiler/android-tests/build.gradle.kts b/compiler/android-tests/build.gradle.kts index f674e13dcbb..ed2b4de3377 100644 --- a/compiler/android-tests/build.gradle.kts +++ b/compiler/android-tests/build.gradle.kts @@ -41,8 +41,10 @@ sourceSets { projectTest { dependsOn(":dist") + val jdkHome = project.getToolchainJdkHomeFor(JdkMajorVersion.JDK_1_8) doFirst { environment("kotlin.tests.android.timeout", "45") + environment("JAVA_HOME", jdkHome.get()) } if (project.hasProperty("teamcity") || project.hasProperty("kotlin.test.android.teamcity")) {