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

2022-01-11 14:58:56 +00:00
parent a52cbd67a3 105deedfc7
commit ed4900f9d9
4 changed files with 3 additions and 7 deletions
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -3490,7 +3490,9 @@ func (c *Module) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
 				libraryBp2Build(ctx, c)
 			}
 		} else if !static && !shared {
-			libraryHeadersBp2Build(ctx, c)
+			if !prebuilt {
+				libraryHeadersBp2Build(ctx, c)
+			}
 		} else if static {
 			if prebuilt {
 				prebuiltLibraryStaticBp2Build(ctx, c)