From 5164cb06b5dccdb97f258a8a5bfcc350e71fd748 Mon Sep 17 00:00:00 2001 From: Mikhail Mutcianko Date: Tue, 9 Sep 2014 16:54:10 +0400 Subject: [PATCH] fix android resource path arguments after rebase Original commit: baa442207b5b9bc5d8eb0b571d2d5f4d3e30ed53 --- .../jetbrains/kotlin/jps/build/KotlinBuilder.kt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 1d5cd4e977a..2a13192a5c2 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -64,7 +64,10 @@ import org.jetbrains.kotlin.load.kotlin.PackageClassUtils import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind import org.jetbrains.jps.builders.java.dependencyView.Mappings import org.jetbrains.kotlin.resolve.jvm.JvmClassName +import org.jetbrains.jps.model.module.JpsModule +import org.jetbrains.jps.android.AndroidJpsUtil import org.jetbrains.kotlin.utils.sure +import org.jetbrains.kotlin.jps.build.KotlinJpsCompilerArgumentsProvider public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { class object { @@ -430,6 +433,17 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return outputItemCollector } + private fun getAndroidResPath(module: JpsModule, context: CompileContext): String { + val extension = AndroidJpsUtil.getExtension(module)!! + val path = AndroidJpsUtil.getResourceDirForCompilationPath(extension) + return File(path!!.getAbsolutePath() + "/layout").getAbsolutePath() + } + + private fun getAndroidManifest(module: JpsModule): String { + val extension = AndroidJpsUtil.getExtension(module)!! + return AndroidJpsUtil.getManifestFileForCompilationPath(extension)!!.getAbsolutePath() + } + public class MessageCollectorAdapter(private val context: CompileContext) : MessageCollector { override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation) {