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

Share constants for droidstubs btw Soong & Bazel

Browse Source 
Test: m bp2build && verify constants
Change-Id: I04865414fb627672821b10d8bcc736379dc3da86
This commit is contained in:
Liz Kammer
2023-10-16 15:07:54 -04:00
parent 170dd7239a
commit e09e20ec47
3 changed files with 91 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
java/droidstubs.go
View File

@@ -322,9 +322,7 @@ func (d *Droidstubs) stubsFlags(ctx android.ModuleContext, cmd *android.RuleBuil
func (d *Droidstubs) annotationsFlags(ctx android.ModuleContext, cmd *android.RuleBuilderCommand) {
if Bool(d.properties.Annotations_enabled) {
cmd.Flag("--include-annotations")
cmd.FlagWithArg("--exclude-annotation ", "androidx.annotation.RequiresApi")
cmd.Flag(config.MetalavaAnnotationsFlags)
validatingNullability :=
strings.Contains(String(d.Javadoc.properties.Args), "--validate-nullability-from-merged-stubs") ||
@@ -352,14 +350,7 @@ func (d *Droidstubs) annotationsFlags(ctx android.ModuleContext, cmd *android.Ru
d.mergeAnnoDirFlags(ctx, cmd)
}
// TODO(tnorbye): find owners to fix these warnings when annotation was enabled.
cmd.FlagWithArg("--hide ", "HiddenTypedefConstant").
FlagWithArg("--hide ", "SuperfluousPrefix").
FlagWithArg("--hide ", "AnnotationExtraction").
// b/222738070
FlagWithArg("--hide ", "BannedThrow").
// b/223382732
FlagWithArg("--hide ", "ChangedDefault")
cmd.Flag(config.MetalavaAnnotationsWarningsFlags)
}
}
@@ -519,7 +510,7 @@ func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersi
cmd.BuiltTool("metalava").ImplicitTool(ctx.Config().HostJavaToolPath(ctx, "metalava.jar")).
Flag(config.JavacVmFlags).
Flag("-J--add-opens=java.base/java.util=ALL-UNNAMED").
Flag(config.MetalavaAddOpens).
FlagWithArg("--java-source ", javaVersion.String()).
FlagWithRspFileInputList("@", android.PathForModuleOut(ctx, "metalava.rsp"), srcs).
FlagWithInput("@", srcJarList)
@@ -532,27 +523,9 @@ func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersi
cmd.FlagWithInputList("--classpath ", combinedPaths, ":")
}
cmd.Flag("--color").
Flag("--quiet").
Flag("--format=v2").
FlagWithArg("--repeat-errors-max ", "10").
FlagWithArg("--hide ", "UnresolvedImport").
FlagWithArg("--hide ", "InvalidNullabilityOverride").
// b/223382732
FlagWithArg("--hide ", "ChangedDefault")
// Force metalava to ignore classes on the classpath when an API file contains missing classes.
// See b/285140653 for more information.
cmd.FlagWithArg("--api-class-resolution ", "api")
// Force metalava to sort overloaded methods by their order in the source code.
// See b/285312164 for more information.
// And add concrete overrides of abstract methods, see b/299366704 for more
// information.
cmd.FlagWithArg("--format-defaults ", "overloaded-method-order=source,add-additional-overrides=yes")
cmd.Flag(config.MetalavaFlags)
if ctx.DeviceConfig().HideFlaggedApis() {
cmd.FlagWithArg("--hide-annotation ", "android.annotation.FlaggedApi")
cmd.Flag(config.MetalavaHideFlaggedApis)
}
return cmd