openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove sourcepath argument from metalava invocations 

This is no longer required to find package.html files, so remove it.

Bug: 153703940
Test: m checkapi
Merged-In: I80ec219cb9ef8922094336a5d45652c8e59aa113
Change-Id: I80ec219cb9ef8922094336a5d45652c8e59aa113
(cherry picked from commit 556e8149cb7781cbe01ea01a8b8a05eb1b018f1a)
This commit is contained in:
Anton Hansson 2021-06-04 16:20:25 +01:00
parent 701857903a
commit 363aae4343
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
java/droidstubs.go
View File

@ -393,22 +393,11 @@ func (d *Droidstubs) apiLevelsAnnotationsFlags(ctx android.ModuleContext, cmd *a
}
func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersion javaVersion, srcs android.Paths,
srcJarList android.Path, bootclasspath, classpath classpath, sourcepaths android.Paths,
homeDir android.WritablePath) *android.RuleBuilderCommand {
srcJarList android.Path, bootclasspath, classpath classpath, homeDir android.WritablePath) *android.RuleBuilderCommand {
rule.Command().Text("rm -rf").Flag(homeDir.String())
rule.Command().Text("mkdir -p").Flag(homeDir.String())
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 := rule.Command()
cmd.FlagWithArg("ANDROID_PREFS_ROOT=", homeDir.String())
if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_METALAVA") {
@ -441,13 +430,6 @@ func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersi
cmd.FlagWithInputList("-classpath ", classpath.Paths(), ":")
}
if len(sourcepaths) > 0 {
// TODO(b/153703940): Pass .html files to metalava and remove this argument.
cmd.FlagWithList("-sourcepath ", sourcepaths.Strings(), ":")
} else {
cmd.FlagWithArg("-sourcepath ", `""`)
}
cmd.Flag("--no-banner").
Flag("--color").
Flag("--quiet").
@ -491,7 +473,7 @@ func (d *Droidstubs) GenerateAndroidBuildActions(ctx android.ModuleContext) {
homeDir := android.PathForModuleOut(ctx, "metalava", "home")
cmd := metalavaCmd(ctx, rule, javaVersion, d.Javadoc.srcFiles, srcJarList,
deps.bootClasspath, deps.classpath, d.Javadoc.sourcepaths, homeDir)
deps.bootClasspath, deps.classpath, homeDir)
cmd.Implicits(d.Javadoc.implicits)
d.stubsFlags(ctx, cmd, stubsDir)