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

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
This commit is contained in:
Paul Duffin 2021-05-05 22:55:35 +01:00
parent 7c8769231b
commit e7c94a689b
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java/sdk_library.go
View File

@ -2385,9 +2385,6 @@ type sdkLibrarySdkMemberProperties struct {
// Scope to per scope properties. // Scope to per scope properties.
Scopes map[*apiScope]scopeProperties Scopes map[*apiScope]scopeProperties
// Additional libraries that the exported stubs libraries depend upon.
Libs []string
// The Java stubs source files. // The Java stubs source files.
Stub_srcs []string 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.Naming_scheme = sdk.commonSdkLibraryProperties.Naming_scheme
s.Shared_library = proptools.BoolPtr(sdk.sharedLibrary()) s.Shared_library = proptools.BoolPtr(sdk.sharedLibrary())
s.Compile_dex = sdk.dexProperties.Compile_dex s.Compile_dex = sdk.dexProperties.Compile_dex
@ -2504,8 +2500,4 @@ func (s *sdkLibrarySdkMemberProperties) AddToPropertySet(ctx android.SdkMemberCo
} }
propertySet.AddProperty("doctag_files", dests) propertySet.AddProperty("doctag_files", dests)
} }
if len(s.Libs) > 0 {
propertySet.AddPropertyWithTag("libs", s.Libs, ctx.SnapshotBuilder().SdkMemberReferencePropertyTag(false))
}
} }