summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dan Willemsen <dwillemsen@google.com> 2019-06-13 04:59:17 +0000
committer Dan Willemsen <dwillemsen@google.com> 2019-06-13 05:22:03 +0000
commit1cfbdbe1b2100b59e97e4811e130573150fc1f2a (patch)
treea483511ebad9482d17e64acbe4a0401af7792b9e
parentb085b9b9073b73d8583b01132b965972b405b6fc (diff)
Add another jar used by kotlinc
Bug: 130111713 Test: treehugger Change-Id: If25be6047625cec4ed9802142876cfd8e9ccd3eb
-rw-r--r--java/config/kotlin.go1
-rw-r--r--java/kotlin.go1
2 files changed, 2 insertions, 0 deletions
diff --git a/java/config/kotlin.go b/java/config/kotlin.go
index 7cea0429e..fd8e3dbe9 100644
--- a/java/config/kotlin.go
+++ b/java/config/kotlin.go
@@ -32,6 +32,7 @@ func init() {
pctx.SourcePathVariable("KotlinScriptRuntimeJar", "external/kotlinc/lib/kotlin-script-runtime.jar")
pctx.SourcePathVariable("KotlinTrove4jJar", "external/kotlinc/lib/trove4j.jar")
pctx.SourcePathVariable("KotlinKaptJar", "external/kotlinc/lib/kotlin-annotation-processing.jar")
+ pctx.SourcePathVariable("KotlinAnnotationJar", "external/kotlinc/lib/annotations-13.0.jar")
pctx.SourcePathVariable("KotlinStdlibJar", KotlinStdlibJar)
// These flags silence "Illegal reflective access" warnings when running kotlinc in OpenJDK9
diff --git a/java/kotlin.go b/java/kotlin.go
index 33167bafd..83069072c 100644
--- a/java/kotlin.go
+++ b/java/kotlin.go
@@ -44,6 +44,7 @@ var kotlinc = pctx.AndroidGomaStaticRule("kotlinc",
"${config.KotlinScriptRuntimeJar}",
"${config.KotlinStdlibJar}",
"${config.KotlinTrove4jJar}",
+ "${config.KotlinAnnotationJar}",
"${config.GenKotlinBuildFileCmd}",
"${config.SoongZipCmd}",
"${config.ZipSyncCmd}",