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

Merge "Stop requiring apex_available on java_library members of sdks"

Browse Source
This commit is contained in:
Paul Duffin
2020-04-08 14:26:39 +00:00
committed by Gerrit Code Review
parent 5d7be45a2b 6534770793
commit f76c64018e
5 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
apex/apex.go
View File

@@ -871,13 +871,23 @@ func apexDepsMutator(mctx android.TopDownMutatorContext) {
mctx.VisitDirectDeps(func(child android.Module) {
depName := mctx.OtherModuleName(child)
if am, ok := child.(android.ApexModule); ok && am.CanHaveApexVariants() &&
cur.DepIsInSameApex(mctx, child) {
(cur.DepIsInSameApex(mctx, child) || inAnySdk(child)) {
android.UpdateApexDependency(apexBundles, depName, directDep)
am.BuildForApexes(apexBundles)
}
})
}
// If a module in an APEX depends on a module from an SDK then it needs an APEX
// specific variant created for it. Refer to sdk.sdkDepsReplaceMutator.
func inAnySdk(module android.Module) bool {
if sa, ok := module.(android.SdkAware); ok {
return sa.IsInAnySdk()
}
return false
}
// Create apex variations if a module is included in APEX(s).
func apexMutator(mctx android.BottomUpMutatorContext) {
if am, ok := mctx.Module().(android.ApexModule); ok && am.CanHaveApexVariants() {
@@ -1850,6 +1860,14 @@ func (a *apexBundle) checkApexAvailability(ctx android.ModuleContext) {
apexName := ctx.ModuleName()
fromName := ctx.OtherModuleName(from)
toName := ctx.OtherModuleName(to)
// If `to` is not actually in the same APEX as `from` then it does not need apex_available and neither
// do any of its dependencies.
if am, ok := from.(android.DepIsInSameApex); ok && !am.DepIsInSameApex(ctx, to) {
// As soon as the dependency graph crosses the APEX boundary, don't go further.
return false
}
if to.AvailableFor(apexName) || whitelistedApexAvailable(apexName, toName) {
return true
}

12
apex/apex_test.go
View File

@@ -3543,16 +3543,10 @@ func TestApexAvailable_IndirectDep(t *testing.T) {
testApexError(t, `requires "libbaz" that is not available for the APEX. Dependency path:
.*via tag apex\.dependencyTag.*"sharedLib".*
.*-> libfoo.*link:shared.*
.*via tag cc\.DependencyTag.*"reuse objects".*
.*-> libfoo.*link:static.*
.*via tag cc\.DependencyTag.*"shared from static".*
.*via tag cc\.DependencyTag.*"shared".*
.*-> libbar.*link:shared.*
.*via tag cc\.DependencyTag.*"reuse objects".*
.*-> libbar.*link:static.*
.*via tag cc\.DependencyTag.*"shared from static".*
.*-> libbaz.*link:shared.*
.*via tag cc\.DependencyTag.*"reuse objects".*
.*-> libbaz.*link:static.*`, `
.*via tag cc\.DependencyTag.*"shared".*
.*-> libbaz.*link:shared.*`, `
apex {
name: "myapex",
key: "myapex.key",