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 "Stop exporting java_sdk_library libs in the snapshot" am: 320055eb8c 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1697676

Change-Id: If21ded2582835f36062511d43d03aa2c10827cf4
This commit is contained in:
Paul Duffin 2021-05-07 13:48:55 +00:00 committed by Automerger Merge Worker
parent e1fab6a30b 320055eb8c
commit 78ff835a32
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

@ -2386,9 +2386,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
@ -2440,7 +2437,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
@ -2505,8 +2501,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))
}
} }