diff options
Diffstat (limited to 'cc/prebuilt.go')
| -rw-r--r-- | cc/prebuilt.go | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/cc/prebuilt.go b/cc/prebuilt.go index 1842e5abe..9fbf8794e 100644 --- a/cc/prebuilt.go +++ b/cc/prebuilt.go @@ -388,7 +388,9 @@ func prebuiltLibraryStaticBp2Build(ctx android.TopDownMutatorContext, module *Mo if fullBuild { name += "_bp2build_cc_library_static" } - ctx.CreateBazelTargetModuleWithRestrictions(props, android.CommonAttributes{Name: name}, attrs, prebuiltAttrs.Enabled) + + tags := android.ApexAvailableTags(module) + ctx.CreateBazelTargetModuleWithRestrictions(props, android.CommonAttributes{Name: name, Tags: tags}, attrs, prebuiltAttrs.Enabled) } type bazelPrebuiltLibrarySharedAttributes struct { @@ -408,7 +410,8 @@ func prebuiltLibrarySharedBp2Build(ctx android.TopDownMutatorContext, module *Mo } name := android.RemoveOptionalPrebuiltPrefix(module.Name()) - ctx.CreateBazelTargetModuleWithRestrictions(props, android.CommonAttributes{Name: name}, attrs, prebuiltAttrs.Enabled) + tags := android.ApexAvailableTags(module) + ctx.CreateBazelTargetModuleWithRestrictions(props, android.CommonAttributes{Name: name, Tags: tags}, attrs, prebuiltAttrs.Enabled) } type prebuiltObjectProperties struct { @@ -740,7 +743,8 @@ func prebuiltBinaryBp2Build(ctx android.TopDownMutatorContext, module *Module) { } name := android.RemoveOptionalPrebuiltPrefix(module.Name()) - ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: name}, attrs) + tags := android.ApexAvailableTags(module) + ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: name, Tags: tags}, attrs) } type Sanitized struct { @@ -759,10 +763,10 @@ func srcsForSanitizer(sanitize *sanitize, sanitized Sanitized) []string { if sanitize == nil { return nil } - if Bool(sanitize.Properties.Sanitize.Address) && sanitized.Address.Srcs != nil { + if sanitize.isSanitizerEnabled(Asan) && sanitized.Address.Srcs != nil { return sanitized.Address.Srcs } - if Bool(sanitize.Properties.Sanitize.Hwaddress) && sanitized.Hwaddress.Srcs != nil { + if sanitize.isSanitizerEnabled(Hwasan) && sanitized.Hwaddress.Srcs != nil { return sanitized.Hwaddress.Srcs } return sanitized.None.Srcs |