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

Merge "Ignore license and similar dependencies of prebuilt_apex/apex_set" am: 49387d5468

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1748052

Change-Id: I0816a42b23e10b0acc99723706fc8af292c288a6
This commit is contained in:
Treehugger Robot
2021-06-30 00:36:59 +00:00
committed by Automerger Merge Worker
parent 90e658ef14 49387d5468
commit 20f9907a46
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apex/prebuilt.go
View File

@@ -376,6 +376,12 @@ func (p *prebuiltCommon) apexInfoMutator(mctx android.TopDownMutatorContext) {
} }
} }
// Ignore any modules that do not implement ApexModule as they cannot have an APEX specific
// variant.
if _, ok := child.(android.ApexModule); !ok {
return false
}
// Strip off the prebuilt_ prefix if present before storing content to ensure consistent // Strip off the prebuilt_ prefix if present before storing content to ensure consistent
// behavior whether there is a corresponding source module present or not. // behavior whether there is a corresponding source module present or not.
depName = android.RemoveOptionalPrebuiltPrefix(depName) depName = android.RemoveOptionalPrebuiltPrefix(depName)