diff options
| author | 2024-09-06 06:07:42 +0000 | |
|---|---|---|
| committer | 2024-09-06 06:07:42 +0000 | |
| commit | fae5ec8bbca887066716029a4923c110d819c958 (patch) | |
| tree | 9ca819979f6141bab733c14445fe7b8083ed3744 /apex/apex.go | |
| parent | 4301e29a02937b1ef1b50e7660ee33205bc33d9c (diff) | |
| parent | 003452ff9c3b0dfe57be563d647c9a8dd76e0569 (diff) | |
Merge changes I505a7ad8,I92d88199 into main
* changes:
Disable source apex variant using apex_available_name
Skip `contents` validation of source bootclasspath fragments
Diffstat (limited to 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/apex/apex.go b/apex/apex.go index 6421c8ef1..1f4a99b55 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -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) { |