StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make soong create sourcepath dirs" into sc-dev

Browse Source
This commit is contained in:
Anton Hansson
2021-06-04 17:48:44 +00:00
committed by Android (Google) Code Review
parent 21d41073f5 7eff3a8fc3
commit b6d94b6999
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
java/droidstubs.go
View File

@@ -398,7 +398,17 @@ func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersi
rule.Command().Text("rm -rf").Flag(homeDir.String()) rule.Command().Text("rm -rf").Flag(homeDir.String())
rule.Command().Text("mkdir -p").Flag(homeDir.String()) rule.Command().Text("mkdir -p").Flag(homeDir.String())
cmd := rule.Command() var cmd *android.RuleBuilderCommand
if len(sourcepaths) > 0 {
// We are passing the sourcepaths as an argument to metalava below, but the directories may
// not exist already (if they do not contain any listed inputs for metalava). Note that this
// is in a rule.SboxInputs()rule, so we are not modifying the actual source tree by creating
// these directories.
cmd = rule.Command()
cmd.Text("mkdir -p").Flags(cmd.PathsForInputs(sourcepaths))
}
cmd = rule.Command()
cmd.FlagWithArg("ANDROID_PREFS_ROOT=", homeDir.String()) cmd.FlagWithArg("ANDROID_PREFS_ROOT=", homeDir.String())
if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_METALAVA") { if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_METALAVA") {
@@ -432,6 +442,7 @@ func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersi
} }
if len(sourcepaths) > 0 { if len(sourcepaths) > 0 {
// TODO(b/153703940): Pass .html files to metalava and remove this argument.
cmd.FlagWithList("-sourcepath ", sourcepaths.Strings(), ":") cmd.FlagWithList("-sourcepath ", sourcepaths.Strings(), ":")
} else { } else {
cmd.FlagWithArg("-sourcepath ", `""`) cmd.FlagWithArg("-sourcepath ", `""`)