Merge "Revert "Revert "bp2build: convert host & prebuilt header libraries"""

2022-01-12 13:23:16 +00:00
parent 9ab9437b40 3d3b35c94e
commit e844132b85
4 changed files with 7 additions and 3 deletions
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -3490,9 +3490,7 @@ func (c *Module) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
 				libraryBp2Build(ctx, c)
 			}
 		} else if !static && !shared {
-			if !prebuilt {
-				libraryHeadersBp2Build(ctx, c)
-			}
+			libraryHeadersBp2Build(ctx, c)
 		} else if static {
 			if prebuilt {
 				prebuiltLibraryStaticBp2Build(ctx, c)