aboutsummaryrefslogtreecommitdiffstats
path: root/java/config
diff options
context:
space:
mode:
authorZoran Jovanovic <zoran.jovanovic@sony.com>2018-08-21 17:10:29 +0200
committerColin Cross <ccross@android.com>2018-11-14 15:02:46 +0000
commit8736ce29e8cda85924fa2f083a1421afed965bb2 (patch)
tree7755f70b63be5bce2f22b7c8c66d8ec0dd9f63eb /java/config
parentad9eab8b51f9e38b287d4ab42880d724970126bf (diff)
downloadbuild_soong-8736ce29e8cda85924fa2f083a1421afed965bb2.tar.gz
build_soong-8736ce29e8cda85924fa2f083a1421afed965bb2.tar.bz2
build_soong-8736ce29e8cda85924fa2f083a1421afed965bb2.zip
Enable kotlinc flags in blueprint files
Add support for adding kotlinc files in the module. Some flags are unnecessary as they are added by default (-no-jdk and -no-stdlib), or are not needed on an Android build (-include-runtime), or may conflict with the build (-kotlin-home and -Xintellij-plugin-root), so the error stops the build if they are added. Test: part of java/java_test.go Change-Id: If3b2777062daaa490a20c014e9b1bb4b1cb0a8df Signed-off-by: Zoran Jovanovic <zoran.jovanovic@sony.com>
Diffstat (limited to 'java/config')
-rw-r--r--java/config/kotlin.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/java/config/kotlin.go b/java/config/kotlin.go
index 35f9e9d7..432840e5 100644
--- a/java/config/kotlin.go
+++ b/java/config/kotlin.go
@@ -15,7 +15,11 @@
package config
var (
- KotlinStdlibJar = "external/kotlinc/lib/kotlin-stdlib.jar"
+ KotlinStdlibJar = "external/kotlinc/lib/kotlin-stdlib.jar"
+ KotlincIllegalFlags = []string{
+ "-no-jdk",
+ "-no-stdlib",
+ }
)
func init() {