diff options
| author | Martin Stjernholm <mast@google.com> | 2021-05-21 19:22:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-05-21 19:22:15 +0000 |
| commit | f7a62e6c7383dceafb968adf3fdab7801840d772 (patch) | |
| tree | c79e6e15f0659070aac0df34baa86b8234853b2c /apex | |
| parent | 55d7ed4bbfd3410188617f004624f12dc24b4549 (diff) | |
| parent | 59b9f141739e5c0e852c741f6f809121a90fc228 (diff) | |
| download | soong-f7a62e6c7383dceafb968adf3fdab7801840d772.tar.gz | |
Merge changes I4e7a7ac5,I0c73361b into sc-dev
* changes:
Record the actual APEXes that a module is part of.
Rename InApexes -> InApexVariants
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/apex.go | 10 | ||||
| -rw-r--r-- | apex/prebuilt.go | 3 |
2 files changed, 9 insertions, 4 deletions
diff --git a/apex/apex.go b/apex/apex.go index c2c1833f5..c6c10164d 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -895,12 +895,16 @@ func (a *apexBundle) ApexInfoMutator(mctx android.TopDownMutatorContext) { // This is the main part of this mutator. Mark the collected dependencies that they need to // be built for this apexBundle. + + // Note that there are many different names. + // ApexVariationName: this is the name of the apex variation apexInfo := android.ApexInfo{ - ApexVariationName: mctx.ModuleName(), + ApexVariationName: mctx.ModuleName(), // could be com.android.foo MinSdkVersion: minSdkVersion, RequiredSdks: a.RequiredSdks(), Updatable: a.Updatable(), - InApexes: []string{mctx.ModuleName()}, + InApexVariants: []string{mctx.ModuleName()}, // could be com.android.foo + InApexModules: []string{a.Name()}, // could be com.mycompany.android.foo ApexContents: []*android.ApexContents{apexContents}, } mctx.WalkDeps(func(child, parent android.Module) bool { @@ -1557,7 +1561,7 @@ func (a *apexBundle) WalkPayloadDeps(ctx android.ModuleContext, do android.Paylo } ai := ctx.OtherModuleProvider(child, android.ApexInfoProvider).(android.ApexInfo) - externalDep := !android.InList(ctx.ModuleName(), ai.InApexes) + externalDep := !android.InList(ctx.ModuleName(), ai.InApexVariants) // Visit actually return do(ctx, parent, am, externalDep) diff --git a/apex/prebuilt.go b/apex/prebuilt.go index b0d1cc895..bdd407952 100644 --- a/apex/prebuilt.go +++ b/apex/prebuilt.go @@ -229,7 +229,8 @@ func (p *prebuiltCommon) apexInfoMutator(mctx android.TopDownMutatorContext) { // Create an ApexInfo for the prebuilt_apex. apexInfo := android.ApexInfo{ ApexVariationName: android.RemoveOptionalPrebuiltPrefix(mctx.ModuleName()), - InApexes: []string{mctx.ModuleName()}, + InApexVariants: []string{mctx.ModuleName()}, + InApexModules: []string{mctx.ModuleName()}, ApexContents: []*android.ApexContents{apexContents}, ForPrebuiltApex: true, } |