diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2019-04-07 09:44:35 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2019-04-09 09:50:25 -0700 |
| commit | aad19605c5b4c4f8e207fd15bc689bca57034187 (patch) | |
| tree | be83e87a68b97433cedcf1dad6784bc0d33eb9d8 | |
| parent | b6d171bb73fd4c64b1056dbe97fabf2487811d55 (diff) | |
| download | build_soong-aad19605c5b4c4f8e207fd15bc689bca57034187.tar.gz build_soong-aad19605c5b4c4f8e207fd15bc689bca57034187.tar.bz2 build_soong-aad19605c5b4c4f8e207fd15bc689bca57034187.zip | |
Add extra used dependencies
Found while executing the build actions remotely.
Bug: 130111713
Test: treehugger
Test: run actions remotely with given dependencies, they pass.
Change-Id: I2bff8fb8ccf50fde446d6bcef0f1dca9b2974b4b
| -rw-r--r-- | java/config/kotlin.go | 4 | ||||
| -rw-r--r-- | java/gen.go | 9 | ||||
| -rw-r--r-- | java/kotlin.go | 5 |
3 files changed, 14 insertions, 4 deletions
diff --git a/java/config/kotlin.go b/java/config/kotlin.go index 2af7b3c3..7cea0429 100644 --- a/java/config/kotlin.go +++ b/java/config/kotlin.go @@ -27,6 +27,10 @@ var ( func init() { pctx.SourcePathVariable("KotlincCmd", "external/kotlinc/bin/kotlinc") pctx.SourcePathVariable("KotlinCompilerJar", "external/kotlinc/lib/kotlin-compiler.jar") + pctx.SourcePathVariable("KotlinPreloaderJar", "external/kotlinc/lib/kotlin-preloader.jar") + pctx.SourcePathVariable("KotlinReflectJar", "external/kotlinc/lib/kotlin-reflect.jar") + 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("KotlinStdlibJar", KotlinStdlibJar) diff --git a/java/gen.go b/java/gen.go index 500d887e..7c57a46a 100644 --- a/java/gen.go +++ b/java/gen.go @@ -23,8 +23,9 @@ import ( func init() { pctx.HostBinToolVariable("aidlCmd", "aidl") pctx.HostBinToolVariable("syspropCmd", "sysprop_java") - pctx.SourcePathVariable("logtagsCmd", "build/tools/java-event-log-tags.py") - pctx.SourcePathVariable("mergeLogtagsCmd", "build/tools/merge-event-log-tags.py") + pctx.SourcePathVariable("logtagsCmd", "build/make/tools/java-event-log-tags.py") + pctx.SourcePathVariable("mergeLogtagsCmd", "build/make/tools/merge-event-log-tags.py") + pctx.SourcePathVariable("logtagsLib", "build/make/tools/event_log_tags.py") } var ( @@ -38,13 +39,13 @@ var ( logtags = pctx.AndroidStaticRule("logtags", blueprint.RuleParams{ Command: "$logtagsCmd -o $out $in", - CommandDeps: []string{"$logtagsCmd"}, + CommandDeps: []string{"$logtagsCmd", "$logtagsLib"}, }) mergeLogtags = pctx.AndroidStaticRule("mergeLogtags", blueprint.RuleParams{ Command: "$mergeLogtagsCmd -o $out $in", - CommandDeps: []string{"$mergeLogtagsCmd"}, + CommandDeps: []string{"$mergeLogtagsCmd", "$logtagsLib"}, }) sysprop = pctx.AndroidStaticRule("sysprop", diff --git a/java/kotlin.go b/java/kotlin.go index 81b89f96..054998f0 100644 --- a/java/kotlin.go +++ b/java/kotlin.go @@ -37,6 +37,11 @@ var kotlinc = pctx.AndroidGomaStaticRule("kotlinc", CommandDeps: []string{ "${config.KotlincCmd}", "${config.KotlinCompilerJar}", + "${config.KotlinPreloaderJar}", + "${config.KotlinReflectJar}", + "${config.KotlinScriptRuntimeJar}", + "${config.KotlinStdlibJar}", + "${config.KotlinTrove4jJar}", "${config.GenKotlinBuildFileCmd}", "${config.SoongZipCmd}", "${config.ZipSyncCmd}", |