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 "java_sdk_library: Simplify SdkLibrary.sdkJars"

This commit is contained in:
Treehugger Robot 2020-05-26 15:46:52 +00:00 committed by Gerrit Code Review
parent ede18549e5 c91f5d0cc7
commit 3f82e2426e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
java/sdk_library.go
View File

@ -1296,14 +1296,15 @@ func PrebuiltJars(ctx android.BaseModuleContext, baseName string, s sdkSpec) and
func (module *SdkLibrary) sdkJars(ctx android.BaseModuleContext, sdkVersion sdkSpec, headerJars bool) android.Paths {
// Check any special cases for java_sdk_library.
if !sdkVersion.specified() {
//
// Only allow access to the implementation library in the following condition:
// * No sdk_version specified on the referencing module.
if sdkVersion.kind == sdkPrivate {
if headerJars {
return module.HeaderJars()
} else {
return module.ImplementationJars()
}
} else if sdkVersion.kind == sdkPrivate {
return module.HeaderJars()
}
return module.selectHeaderJarsForSdkVersion(ctx, sdkVersion)