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 18364a3fcb2..7c9520d1180 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 @@ -71,8 +71,8 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase { } private void prepareAndroidModule() throws IOException { - System.out.println("Copying kotlin-runtime.jar in android module..."); - copyKotlinRuntimeJar(); + System.out.println("Copying kotlin-runtime.jar and kotlin-reflect.jar in android module..."); + copyKotlinRuntimeJars(); System.out.println("Check \"libs\" folder in tested android module..."); File libsFolderInTestedModule = new File(pathManager.getLibsFolderInAndroidTestedModuleTmpFolder()); @@ -81,11 +81,15 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase { } } - private void copyKotlinRuntimeJar() throws IOException { + private void copyKotlinRuntimeJars() throws IOException { FileUtil.copy( ForTestCompileRuntime.runtimeJarForTests(), new File(pathManager.getLibsFolderInAndroidTmpFolder() + "/kotlin-runtime.jar") ); + FileUtil.copy( + ForTestCompileRuntime.reflectJarForTests(), + new File(pathManager.getLibsFolderInAndroidTmpFolder() + "/kotlin-reflect.jar") + ); } private void generateAndSave() throws Throwable { diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java index d6bba2ff947..f7fb0b300ff 100644 --- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java +++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java @@ -68,6 +68,8 @@ public class SpecialFiles { excludedFiles.add("classpath.kt"); // Some classes are not visible on android excludedFiles.add("manyNumbers.kt"); // Out of memory + + excludedFiles.add("smap"); // Line numbers } private SpecialFiles() {