Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ff28e50 authored by Anton Hansson's avatar Anton Hansson
Browse files

Disable "check last" for test api 

@TestApi does not have stability requirements, so we shouldn't be
checking its compatibility with the last released version.

This CL removes the expectation that a test-removed.txt is checked in
for each module during finalization.

Bug: 155197156
Test: m (with SDK 30 imported)
Change-Id: Ib3f671493f1d230116bec51b884e8072643b10d4
parent 2a5fb913

java/sdk_library.go

+12 −6
Original line number Original line Diff line number Diff line
@@ -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,
@@ -556,12 +560,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)





	if !apiScope.unstable {

		// check against the latest released API

		// check against the latest released API

		props.Check_api.Last_released.Api_file = proptools.StringPtr(

		props.Check_api.Last_released.Api_file = proptools.StringPtr(

			module.latestApiFilegroupName(apiScope))

			module.latestApiFilegroupName(apiScope))

		props.Check_api.Last_released.Removed_api_file = proptools.StringPtr(

		props.Check_api.Last_released.Removed_api_file = proptools.StringPtr(

			module.latestRemovedApiFilegroupName(apiScope))

			module.latestRemovedApiFilegroupName(apiScope))

		props.Check_api.Ignore_missing_latest_api = proptools.BoolPtr(true)

		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) {