commit 105deedfc7879a0e2d2c1ed9f0dcb7793b716513
author Jingwen Chen <jingwen@google.com> Tue Jan 11 12:30:20 2022 +0000
committer Jingwen Chen <jingwen@google.com> Tue Jan 11 12:51:27 2022 +0000
tree 4c4980e145485ce4b89ed26d7cdd6ebd14493cde
parent d8a72d7dc91b2122b7b10b47b80cf2f7c65f9049

Revert "bp2build: convert host & prebuilt header libraries"

This reverts commit d8a72d7dc91b2122b7b10b47b80cf2f7c65f9049.

Reason for revert: root cause for b/214013899

Change-Id: If769708408c419c2fd3d9484fbf40202b7276299

cc/cc.go

diff --git a/cc/cc.go b/cc/cc.go
index 82b7c87..281ebc1 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -3476,7 +3476,9 @@
 				libraryBp2Build(ctx, c)
 			}
 		} else if !static && !shared {
-			libraryHeadersBp2Build(ctx, c)
+			if !prebuilt {
+				libraryHeadersBp2Build(ctx, c)
+			}
 		} else if static {
 			if prebuilt {
 				prebuiltLibraryStaticBp2Build(ctx, c)