From 701857903a4733cff50d26fc2607c41f233b1a2f Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Fri, 4 Jun 2021 13:54:28 +0100 Subject: [PATCH 1/2] Stop filtering html files from droidstubs input Metalava now expects html files to be specified explicitly. This filtering was originally added because jdiff could not cope with html inputs, but jdiff support has been removed in r.android.com/1455335. Bug: 153703940 Test: m checkapi Merged-In: I34164b633bab2892e3a1c0fd0257fcf98d537655 Change-Id: I34164b633bab2892e3a1c0fd0257fcf98d537655 (cherry picked from commit edd61643be3096af46d1f6aea1091897f668c66b) --- java/droiddoc.go | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/java/droiddoc.go b/java/droiddoc.go index 56e62473f..869a5982d 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -425,23 +425,6 @@ func (j *Javadoc) collectDeps(ctx android.ModuleContext) deps { } srcFiles = filterByPackage(srcFiles, j.properties.Filter_packages) - // While metalava needs package html files, it does not need them to be explicit on the command - // line. javadoc complains if it receives html files on the command line. The filter - // below excludes html files from the rsp file metalava. Note that the html - // files are still included as implicit inputs for successful remote execution and correct - // incremental builds. - filterHtml := func(srcs []android.Path) []android.Path { - filtered := []android.Path{} - for _, src := range srcs { - if src.Ext() == ".html" { - continue - } - filtered = append(filtered, src) - } - return filtered - } - srcFiles = filterHtml(srcFiles) - aidlFlags := j.collectAidlFlags(ctx, deps) srcFiles = j.genSources(ctx, srcFiles, aidlFlags) From 363aae434373f5dabef719a3cdd398a3c7973424 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Fri, 4 Jun 2021 16:20:25 +0100 Subject: [PATCH 2/2] 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) --- java/droidstubs.go | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/java/droidstubs.go b/java/droidstubs.go index 28f233e33..eed252800 100644 --- a/java/droidstubs.go +++ b/java/droidstubs.go @@ -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)