From e7c94a689bd2305ad356197a8a56e48b4ca6bcb6 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 5 May 2021 22:55:35 +0100 Subject: [PATCH] Stop exporting java_sdk_library libs in the snapshot The libs property in java_sdk_library is not safe to export as it can contain libraries that contain implementation specific classes. No snapshot appears to need this capability but if it does become necessary then either it will need to use the existing stub_only_libs property or a new one will need to be added. Bug: 157884619 Test: m nothing Change-Id: I60a069177dbee4070d311b23d25f4eb3c5e7ea13 --- java/sdk_library.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/java/sdk_library.go b/java/sdk_library.go index fcc105d56..ee311106c 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -2385,9 +2385,6 @@ type sdkLibrarySdkMemberProperties struct { // Scope to per scope properties. Scopes map[*apiScope]scopeProperties - // Additional libraries that the exported stubs libraries depend upon. - Libs []string - // The Java stubs source files. Stub_srcs []string @@ -2439,7 +2436,6 @@ func (s *sdkLibrarySdkMemberProperties) PopulateFromVariant(ctx android.SdkMembe } } - s.Libs = sdk.properties.Libs s.Naming_scheme = sdk.commonSdkLibraryProperties.Naming_scheme s.Shared_library = proptools.BoolPtr(sdk.sharedLibrary()) s.Compile_dex = sdk.dexProperties.Compile_dex @@ -2504,8 +2500,4 @@ func (s *sdkLibrarySdkMemberProperties) AddToPropertySet(ctx android.SdkMemberCo } propertySet.AddProperty("doctag_files", dests) } - - if len(s.Libs) > 0 { - propertySet.AddPropertyWithTag("libs", s.Libs, ctx.SnapshotBuilder().SdkMemberReferencePropertyTag(false)) - } }