openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Disable "check last" for test api"

This commit is contained in:
Anton Hansson 2020-05-05 15:42:53 +00:00 committed by Gerrit Code Review
parent d0666441b5 6478ac17fc
commit a1910e8488
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
java/sdk_library.go
View File

@ -90,6 +90,9 @@ type apiScope struct {
// Extra arguments to pass to droidstubs for this scope. // Extra arguments to pass to droidstubs for this scope.
droidstubsArgs []string droidstubsArgs []string
// Whether the api scope can be treated as unstable, and should skip compat checks.
unstable bool
} }
// Initialize a scope, creating and adding appropriate dependency tags // Initialize a scope, creating and adding appropriate dependency tags
@ -142,6 +145,7 @@ var (
moduleSuffix: sdkTestApiSuffix, moduleSuffix: sdkTestApiSuffix,
sdkVersion: "test_current", sdkVersion: "test_current",
droidstubsArgs: []string{"-showAnnotation android.annotation.TestApi"}, droidstubsArgs: []string{"-showAnnotation android.annotation.TestApi"},
unstable: true,
}) })
allApiScopes = apiScopes{ allApiScopes = apiScopes{
apiScopePublic, apiScopePublic,
@ -560,12 +564,14 @@ func (module *SdkLibrary) createStubsSources(mctx android.LoadHookContext, apiSc
props.Check_api.Current.Api_file = proptools.StringPtr(currentApiFileName) props.Check_api.Current.Api_file = proptools.StringPtr(currentApiFileName)
props.Check_api.Current.Removed_api_file = proptools.StringPtr(removedApiFileName) props.Check_api.Current.Removed_api_file = proptools.StringPtr(removedApiFileName)
// check against the latest released API if !apiScope.unstable {
props.Check_api.Last_released.Api_file = proptools.StringPtr( // check against the latest released API
module.latestApiFilegroupName(apiScope)) props.Check_api.Last_released.Api_file = proptools.StringPtr(
props.Check_api.Last_released.Removed_api_file = proptools.StringPtr( module.latestApiFilegroupName(apiScope))
module.latestRemovedApiFilegroupName(apiScope)) props.Check_api.Last_released.Removed_api_file = proptools.StringPtr(
props.Check_api.Ignore_missing_latest_api = proptools.BoolPtr(true) module.latestRemovedApiFilegroupName(apiScope))
props.Check_api.Ignore_missing_latest_api = proptools.BoolPtr(true)
}
// Dist the api txt artifact for sdk builds. // Dist the api txt artifact for sdk builds.
if !Bool(module.sdkLibraryProperties.No_dist) { if !Bool(module.sdkLibraryProperties.No_dist) {