tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Explicitly specify --api-class-resolution api for metalava

Browse source 
Previously, `--api-class-resolution api` was the default if that option
was not specified but the other change in this topic is switching it to
`--api-class-resolution api:classpath` to match the behavior in
AndroidX. This change explicitly specifies the option needed by Soong's
use of metalava.

Bug: 285140653
Test: m checkapi
Change-Id: Ief3c7f9dfdfa946f21cb048a579ec90309fb350f
This commit is contained in:
Paul Duffin 2023-05-31 17:51:33 +01:00
parent b2cd6f6963
commit 5b7035f850
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
java/droidstubs.go
View file

@ -535,6 +535,10 @@ func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersi
// 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")
return cmd
}

4
java/java.go
View file

@ -1728,6 +1728,10 @@ func metalavaStubCmd(ctx android.ModuleContext, rule *android.RuleBuilder,
FlagWithArg("--hide ", "InvalidNullabilityOverride").
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")
return cmd
}