diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java index 0621efcdb75..5a884713365 100644 --- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java +++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java @@ -155,9 +155,9 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase { private KotlinCoreEnvironment createEnvironment(boolean isFullJdkAndRuntime) { ConfigurationKind configurationKind = isFullJdkAndRuntime ? ConfigurationKind.ALL : ConfigurationKind.JDK_ONLY; - CompilerConfiguration configuration = KotlinTestUtils.compilerConfigurationForTests( - configurationKind, TestJdkKind.FULL_JDK, KotlinTestUtils.getAnnotationsJar() - ); + TestJdkKind testJdkKind = isFullJdkAndRuntime ? TestJdkKind.FULL_JDK : TestJdkKind.MOCK_JDK; + CompilerConfiguration configuration = + KotlinTestUtils.compilerConfigurationForTests(configurationKind, testJdkKind, KotlinTestUtils.getAnnotationsJar()); configuration.put(JVMConfigurationKeys.MODULE_NAME, "android-module-" + MODULE_INDEX++); if (inheritMultifileParts) { configuration.put(JVMConfigurationKeys.INHERIT_MULTIFILE_PARTS, true);