From a2c4cd7cbf6ff893c5cf9d2dba97351b17469431 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 18 Jun 2024 18:49:48 +0100 Subject: Update previous_api for droidstubs and java_api_library Needed to ensure recently added nullability annotations `@Nullable` and `@NonNull` are correctly replaced with `@RecentlyNullable` and `@RecentlyNonNull` respectively. Bug: 347751326 Test: # Build modules before and after this change and verify that # public stubs are unchanged but other stubs use the correct # nullability annotations. Change-Id: If97859b6207f03c1dcd3a0cc9c44f82147449cad --- api/api.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'api/api.go') diff --git a/api/api.go b/api/api.go index 449fac63f90c..d4db49e90a01 100644 --- a/api/api.go +++ b/api/api.go @@ -478,7 +478,7 @@ func createApiContributionDefaults(ctx android.LoadHookContext, modules []string props.Api_contributions = transformArray( modules, "", fmt.Sprintf(".stubs.source%s.api.contribution", apiSuffix)) props.Defaults_visibility = []string{"//visibility:public"} - props.Previous_api = proptools.StringPtr(":android.api.public.latest") + props.Previous_api = proptools.StringPtr(":android.api.combined." + sdkKind.String() + ".latest") ctx.CreateModule(java.DefaultsFactory, &props) } } -- cgit v1.2.3-59-g8ed1b