Merge changes I505a7ad8,I92d88199 into main

* changes:
  Disable source apex variant using apex_available_name
  Skip `contents` validation of source bootclasspath fragments
This commit is contained in:
Treehugger Robot
2024-09-06 06:07:42 +00:00
committed by Gerrit Code Review
5 changed files with 22 additions and 3 deletions

View File

@@ -1078,6 +1078,7 @@ func (a *apexBundle) ApexInfoMutator(mctx android.TopDownMutatorContext) {
ApexContents: []*android.ApexContents{apexContents},
TestApexes: testApexes,
BaseApexName: mctx.ModuleName(),
ApexAvailableName: proptools.String(a.properties.Apex_available_name),
}
mctx.WalkDeps(func(child, parent android.Module) bool {
if !continueApexDepsWalk(child, parent) {