aboutsummaryrefslogtreecommitdiffstats
path: root/java/config
diff options
context:
space:
mode:
authorPrzemyslaw Szczepaniak <pszczepaniak@google.com>2018-02-13 14:32:54 +0000
committerColin Cross <ccross@android.com>2018-02-14 20:47:17 +0000
commit4b5fe9d1b4c6e8491a0f793ad43710fef7b78b74 (patch)
tree8466075dae2e245b43fc1e6d027f8e2bd158d8b2 /java/config
parent51be632b95c0693641b7fdf8ec08e797ce804198 (diff)
downloadbuild_soong-4b5fe9d1b4c6e8491a0f793ad43710fef7b78b74.tar.gz
build_soong-4b5fe9d1b4c6e8491a0f793ad43710fef7b78b74.tar.bz2
build_soong-4b5fe9d1b4c6e8491a0f793ad43710fef7b78b74.zip
Add rsp and srcjar support to kotlinc build rule
Rsp files are supported through helper script (gen-kotlin-build-file.sh) that generates the kotlinc module/build xml file. Since rsp files are supported, I've added ExtractSrcJarsCmd step to handle srcjars extraction. Minor reorderings to make sure that TransformKotlinToClasses recives only .java and .kt files when called from Module.compile. Bug: 73281388 Test: make -j hidl-doc Change-Id: I5a40b914569018dc529903a7f2864a5aeae838e5
Diffstat (limited to 'java/config')
-rw-r--r--java/config/config.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/java/config/config.go b/java/config/config.go
index 75176c98..b5e574e9 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -83,6 +83,8 @@ func init() {
pctx.SourcePathVariable("Ziptime", "prebuilts/build-tools/${hostPrebuiltTag}/bin/ziptime")
pctx.SourcePathVariable("ExtractSrcJarsCmd", "build/soong/scripts/extract-srcjars.sh")
+ pctx.SourcePathVariable("GenKotlinBuildFileCmd", "build/soong/scripts/gen-kotlin-build-file.sh")
+
pctx.SourcePathVariable("JarArgsCmd", "build/soong/scripts/jar-args.sh")
pctx.HostBinToolVariable("SoongZipCmd", "soong_zip")
pctx.HostBinToolVariable("MergeZipsCmd", "merge_zips")