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

Merge "Rename ApexName to ApexVariationName"

Browse Source
This commit is contained in:
Treehugger Robot
2020-08-15 06:43:52 +00:00
committed by Gerrit Code Review
parent cc1bfd6aa0 e07f2316b7
commit a07777d434
9 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apex/apex.go
View File

@@ -686,9 +686,9 @@ func apexDepsMutator(mctx android.TopDownMutatorContext) {
return
}
apexInfo := android.ApexInfo{
ApexName: mctx.ModuleName(),
MinSdkVersion: a.minSdkVersion(mctx),
Updatable: a.Updatable(),
ApexVariationName: mctx.ModuleName(),
MinSdkVersion: a.minSdkVersion(mctx),
Updatable: a.Updatable(),
}
useVndk := a.SocSpecific() || a.DeviceSpecific() || (a.ProductSpecific() && mctx.Config().EnforceProductPartitionInterface())
@@ -1797,7 +1797,7 @@ func (a *apexBundle) WalkPayloadDeps(ctx android.ModuleContext, do android.Paylo
}
// Check for the indirect dependencies if it is considered as part of the APEX
if am.ApexName() != "" {
if am.ApexVariationName() != "" {
return do(ctx, parent, am, false /* externalDep */)
}