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

Merge "Deduplicate APEX variants that would build identically" am: ca29a25d38 am: aa3235edcc

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

Change-Id: I4fe0cc33956d110e6bb1de49183470eb21992fbf
This commit is contained in:
Treehugger Robot
2020-08-18 05:19:52 +00:00
committed by Automerger Merge Worker
parent fccfde5f81 aa3235edcc
commit 1f160e818b
12 changed files with 394 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
java/sdk_library.go
View File

@@ -1386,22 +1386,22 @@ func PrebuiltJars(ctx android.BaseModuleContext, baseName string, s sdkSpec) and
return android.Paths{jarPath.Path()}
}
// Get the apex name for module, "" if it is for platform.
func getApexNameForModule(module android.Module) string {
// Get the apex names for module, nil if it is for platform.
func getApexNamesForModule(module android.Module) []string {
if apex, ok := module.(android.ApexModule); ok {
return apex.ApexVariationName()
return apex.InApexes()
}
return ""
return nil
}
// Check to see if the other module is within the same named APEX as this module.
// Check to see if the other module is within the same set of named APEXes as this module.
//
// If either this or the other module are on the platform then this will return
// false.
func withinSameApexAs(module android.ApexModule, other android.Module) bool {
name := module.ApexVariationName()
return name != "" && getApexNameForModule(other) == name
func withinSameApexesAs(module android.ApexModule, other android.Module) bool {
names := module.InApexes()
return len(names) > 0 && reflect.DeepEqual(names, getApexNamesForModule(other))
}
func (module *SdkLibrary) sdkJars(ctx android.BaseModuleContext, sdkVersion sdkSpec, headerJars bool) android.Paths {
@@ -1420,7 +1420,7 @@ func (module *SdkLibrary) sdkJars(ctx android.BaseModuleContext, sdkVersion sdkS
// Only allow access to the implementation library in the following condition:
// * No sdk_version specified on the referencing module.
// * The referencing module is in the same apex as this.
if sdkVersion.kind == sdkPrivate || withinSameApexAs(module, ctx.Module()) {
if sdkVersion.kind == sdkPrivate || withinSameApexesAs(module, ctx.Module()) {
if headerJars {
return module.HeaderJars()
} else {
@@ -1959,7 +1959,7 @@ func (module *SdkLibraryImport) sdkJars(ctx android.BaseModuleContext, sdkVersio
// For consistency with SdkLibrary make the implementation jar available to libraries that
// are within the same APEX.
implLibraryModule := module.implLibraryModule
if implLibraryModule != nil && withinSameApexAs(module, ctx.Module()) {
if implLibraryModule != nil && withinSameApexesAs(module, ctx.Module()) {
if headerJars {
return implLibraryModule.HeaderJars()
} else {