Always convert prebuilt cc library headers

Test: go tests
Test: CI
Test: patch in CL using prebuilts for mainline modules and build
Bug: 300640274
Change-Id: I73f70dac679e341670e1484ce57bc984f413d409
This commit is contained in:
Liz Kammer
2023-09-18 09:23:38 -04:00
parent 06ac78ce40
commit 86a407f284
3 changed files with 51 additions and 40 deletions

View File

@@ -153,8 +153,13 @@ func libraryHeadersBp2Build(ctx android.TopDownMutatorContext, module *Module) {
tags := android.ApexAvailableTagsWithoutTestApexes(ctx, module)
name := module.Name()
if module.IsPrebuilt() {
name = android.RemoveOptionalPrebuiltPrefix(name)
}
ctx.CreateBazelTargetModule(props, android.CommonAttributes{
Name: module.Name(),
Name: name,
Tags: tags,
}, attrs)
}