From 7fd2a016e78e2146535048ef01224ea4ee0c7cbf Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Tue, 24 May 2016 17:44:41 +0300
Subject: [PATCH] Fix Android codegen tests: use full JDK only when needed

This was accidentally broken in 8a00cabce6099219676b6d1de7c78a42e00fb3ff
---
 .../android/tests/CodegenTestsOnAndroidGenerator.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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);