Merge "Add a new flag to stop disabling lint errors" into main

This commit is contained in:
Anton Hansson
2023-11-07 16:01:29 +00:00
committed by Gerrit Code Review

View File

@@ -618,6 +618,10 @@ type sdkLibraryProperties struct {
Api_lint struct { Api_lint struct {
// Enable api linting. // Enable api linting.
Enabled *bool Enabled *bool
// If API lint is enabled, this flag controls whether a set of legitimate lint errors
// are turned off. The default is true.
Legacy_errors_allowed *bool
} }
// TODO: determines whether to create HTML doc or not // TODO: determines whether to create HTML doc or not
@@ -1747,13 +1751,15 @@ func (module *SdkLibrary) createStubsSourcesAndApi(mctx android.DefaultableHookC
android.JoinWithPrefix(module.sdkLibraryProperties.Hidden_api_packages, " --hide-package ")) android.JoinWithPrefix(module.sdkLibraryProperties.Hidden_api_packages, " --hide-package "))
} }
droidstubsArgs = append(droidstubsArgs, module.sdkLibraryProperties.Droiddoc_options...) droidstubsArgs = append(droidstubsArgs, module.sdkLibraryProperties.Droiddoc_options...)
disabledWarnings := []string{ disabledWarnings := []string{"HiddenSuperclass"}
"BroadcastBehavior", if proptools.BoolDefault(module.sdkLibraryProperties.Api_lint.Legacy_errors_allowed, true) {
"DeprecationMismatch", disabledWarnings = append(disabledWarnings,
"HiddenSuperclass", "BroadcastBehavior",
"MissingPermission", "DeprecationMismatch",
"SdkConstant", "MissingPermission",
"Todo", "SdkConstant",
"Todo",
)
} }
droidstubsArgs = append(droidstubsArgs, android.JoinWithPrefix(disabledWarnings, "--hide ")) droidstubsArgs = append(droidstubsArgs, android.JoinWithPrefix(disabledWarnings, "--hide "))