azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add ANDROID target

Browse Source
This commit is contained in:
Mikhail Bogdanov
2020-04-13 20:06:50 +02:00
parent 9d68db1668
commit dec93c8b49
32 changed files with 115 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
+14 -3
View File
@@ -773,16 +773,27 @@ public abstract class CodegenTestCase extends KotlinBaseTest<KotlinBaseTest.Test
@Override
@NotNull
protected List<TestFile> createTestFilesFromFile(File file, @NotNull String expectedText) {
protected List<TestFile> createTestFilesFromFile(@NotNull File file, @NotNull String expectedText) {
return createTestFilesFromFile(file, expectedText, coroutinesPackage, parseDirectivesPerFiles(), getBackend());
}
@NotNull
public static List<TestFile> createTestFilesFromFile(
@NotNull File file,
@NotNull String expectedText,
@NotNull String coroutinesPackage,
boolean parseDirectivesPerFiles,
@NotNull TargetBackend backend
) {
List testFiles = TestFiles.createTestFiles(file.getName(), expectedText, new TestFiles.TestFileFactoryNoModules<TestFile>() {
@NotNull
@Override
public TestFile create(@NotNull String fileName, @NotNull String text, @NotNull Directives directives) {
return new TestFile(fileName, text, directives);
}
}, false, coroutinesPackage, parseDirectivesPerFiles());
}, false, coroutinesPackage, parseDirectivesPerFiles);
if (InTextDirectivesUtils.isDirectiveDefined(expectedText, "WITH_HELPERS")) {
testFiles.add(new TestFile("CodegenTestHelpers.kt", TestHelperGeneratorKt.createTextForCodegenTestHelpers(getBackend())));
testFiles.add(new TestFile("CodegenTestHelpers.kt", TestHelperGeneratorKt.createTextForCodegenTestHelpers(backend)));
}
return testFiles;
}
compiler/tests-common/tests/org/jetbrains/kotlin/test/TargetBackend.kt
+2 -1
View File
@@ -15,7 +15,8 @@ enum class TargetBackend(
JVM_IR(true, JVM),
JS(false),
JS_IR(true, JS),
WASM(true);
WASM(true),
ANDROID(false, JVM);
val compatibleWith get() = compatibleWithTargetBackend ?: ANY
}