StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

java_sdk_library: Only expose impl jars when they are built am: daaa332827 am: d3320c8787

Browse Source 
Change-Id: I708870ffee014e50c7bbeb018672bfb9bac03a91
This commit is contained in:
Paul Duffin
2020-05-26 22:08:22 +00:00
committed by Automerger Merge Worker
parent c649a55d1c d3320c8787
commit 2fa5ff0d25
2 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
java/sdk_library.go
View File

@@ -1297,15 +1297,18 @@ 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.
//
// 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()
// Only provide access to the implementation library if it is actually built.
if module.requiresRuntimeImplementationLibrary() {
// Check any special cases for java_sdk_library.
//
// 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()
}
}
}