diff options
| author | 2021-03-17 15:14:19 +0000 | |
|---|---|---|
| committer | 2021-03-17 15:14:19 +0000 | |
| commit | 45a497180892a47cd69758b9d9126b7c608485ce (patch) | |
| tree | 72011578a26020fabead22c00a6c4caf08307dee /java/kotlin.go | |
| parent | d7ce8402d8895b7ba9d13092d27037784a43cc0e (diff) | |
| parent | b70a1a900ac2af03421a0b503d7c60b8d32be96d (diff) | |
Merge changes from topic "rule_builder_rsp"
* changes:
Remove unescaped spans support from RuleBuilder
Add explicit rspfile argument to RuleBuilderCommand.FlagWithRspFileInputList
Ninja escape RuleBuilder rule params
Diffstat (limited to 'java/kotlin.go')
| -rw-r--r-- | java/kotlin.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/java/kotlin.go b/java/kotlin.go index 8067ad521..2960f819d 100644 --- a/java/kotlin.go +++ b/java/kotlin.go @@ -64,7 +64,9 @@ func kotlinCommonSrcsList(ctx android.ModuleContext, commonSrcFiles android.Path // Insert a second rule to write out the list of resources to a file. commonSrcsList := android.PathForModuleOut(ctx, "kotlinc_common_srcs.list") rule := android.NewRuleBuilder(pctx, ctx) - rule.Command().Text("cp").FlagWithRspFileInputList("", commonSrcFiles).Output(commonSrcsList) + rule.Command().Text("cp"). + FlagWithRspFileInputList("", commonSrcsList.ReplaceExtension(ctx, "rsp"), commonSrcFiles). + Output(commonSrcsList) rule.Build("kotlin_common_srcs_list", "kotlin common_srcs list") return android.OptionalPathForPath(commonSrcsList) } |