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

Merge "Update build to handle documentation issues being errors" into main am: 1705676dd0

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3106478

Change-Id: I8e5af23977fedacef49dab1b65923098cab99e09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-05-28 23:20:31 +00:00
committed by Automerger Merge Worker
parent 7f8190b9d2 1705676dd0
commit b61caca9d4
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/droidstubs.go
View File

@@ -993,6 +993,7 @@ func (d *Droidstubs) everythingStubCmd(ctx android.ModuleContext, params stubsCo
func (d *Droidstubs) everythingOptionalCmd(ctx android.ModuleContext, cmd *android.RuleBuilderCommand, doApiLint bool, doCheckReleased bool) { func (d *Droidstubs) everythingOptionalCmd(ctx android.ModuleContext, cmd *android.RuleBuilderCommand, doApiLint bool, doCheckReleased bool) {
// Add API lint options. // Add API lint options.
treatDocumentationIssuesAsErrors := false
if doApiLint { if doApiLint {
var newSince android.Paths var newSince android.Paths
if d.properties.Check_api.Api_lint.New_since != nil { if d.properties.Check_api.Api_lint.New_since != nil {
@@ -1006,7 +1007,7 @@ func (d *Droidstubs) everythingOptionalCmd(ctx android.ModuleContext, cmd *andro
// TODO(b/154317059): Clean up this allowlist by baselining and/or checking in last-released. // TODO(b/154317059): Clean up this allowlist by baselining and/or checking in last-released.
if d.Name() != "android.car-system-stubs-docs" && if d.Name() != "android.car-system-stubs-docs" &&
d.Name() != "android.car-stubs-docs" { d.Name() != "android.car-stubs-docs" {
cmd.Flag("--lints-as-errors") treatDocumentationIssuesAsErrors = true
cmd.Flag("--warnings-as-errors") // Most lints are actually warnings. cmd.Flag("--warnings-as-errors") // Most lints are actually warnings.
} }
@@ -1052,6 +1053,11 @@ func (d *Droidstubs) everythingOptionalCmd(ctx android.ModuleContext, cmd *andro
cmd.FlagWithArg("--error-message:api-lint ", msg) cmd.FlagWithArg("--error-message:api-lint ", msg)
} }
if !treatDocumentationIssuesAsErrors {
// Treat documentation issues as warnings, but error when new.
cmd.Flag("--error-when-new-category").Flag("Documentation")
}
// Add "check released" options. (Detect incompatible API changes from the last public release) // Add "check released" options. (Detect incompatible API changes from the last public release)
if doCheckReleased { if doCheckReleased {
baselineFile := android.OptionalPathForModuleSrc(ctx, d.properties.Check_api.Last_released.Baseline_file) baselineFile := android.OptionalPathForModuleSrc(ctx, d.properties.Check_api.Last_released.Baseline_file)