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

fix android resource path arguments after rebase

Browse Source
This commit is contained in:
Mikhail Mutcianko
2014-09-09 16:54:10 +04:00
committed by Yan Zhulanow
parent bc9e1ee2d2
commit baa442207b
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea.iml
+1 -2
View File
@@ -39,12 +39,11 @@
<orderEntry type="library" scope="PROVIDED" name="maven" level="project" />
<orderEntry type="module" module-name="eval4j" />
<orderEntry type="module" module-name="frontend.android" />
<orderEntry type="library" scope="PROVIDED" name="android" level="project" />
<orderEntry type="library" name="android" level="project" />
<orderEntry type="module" module-name="idea-analysis" exported="" />
<orderEntry type="module" module-name="kotlin-android-plugin" />
<orderEntry type="module" module-name="js.frontend" />
<orderEntry type="library" scope="PROVIDED" name="coverage-plugin" level="project" />
<orderEntry type="module" module-name="util" />
<orderEntry type="library" name="android_tests" level="project" />
</component>
</module>
jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
+14
View File
@@ -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) {