Merge "Update build to handle documentation issues being errors" into main (1705676d) · Commits · e / os / android_build_soong

java/droidstubs.go

+7 −1

Original line number	Diff line number	Diff line
		@@ -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) {

		// Add API lint options.
		treatDocumentationIssuesAsErrors := false
		if doApiLint {
		var newSince android.Paths
		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.
		if d.Name() != "android.car-system-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.
		}

		@@ -1052,6 +1053,11 @@ func (d Droidstubs) everythingOptionalCmd(ctx android.ModuleContext, cmd andro
		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)
		if doCheckReleased {
		baselineFile := android.OptionalPathForModuleSrc(ctx, d.properties.Check_api.Last_released.Baseline_file)