From 393047883e3c38cc16752d02f581978753229af0 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 21 Nov 2019 10:33:09 +0300 Subject: [PATCH] JavacWrapper: add Kotlin classes to classpath only in APT mode --- .../src/org/jetbrains/kotlin/javac/JavacWrapper.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/JavacWrapper.kt b/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/JavacWrapper.kt index bd2b35e07fb..da19df3a7e1 100644 --- a/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/JavacWrapper.kt +++ b/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/JavacWrapper.kt @@ -375,7 +375,9 @@ class JavacWrapper( // This line is necessary for e.g. CliTestGenerated.jvm.javacKotlinJavaInterdependency to work // In general, it makes compiled Kotlin classes from the module visible for javac // It's necessary when javac work with APT (without -proc:none flag) - fileManager.setLocation(CLASS_PATH, fileManager.getLocation(CLASS_PATH) + outputDir) + if (aptOn) { + fileManager.setLocation(CLASS_PATH, fileManager.getLocation(CLASS_PATH) + outputDir) + } } outputDir.mkdirs() fileManager.setLocation(CLASS_OUTPUT, listOf(outputDir))