Revert "bp2build: convert host & prebuilt header libraries"
This reverts commit d8a72d7dc91b2122b7b10b47b80cf2f7c65f9049.
Reason for revert: root cause for b/214013899
Change-Id: If769708408c419c2fd3d9484fbf40202b7276299
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)
diff --git a/cc/library.go b/cc/library.go
index b18f90d..5720944 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -443,8 +443,6 @@
module, library := NewLibrary(android.HostSupported)
library.BuildOnlyStatic()
module.sdkMemberTypes = []android.SdkMemberType{staticLibrarySdkMemberType}
- module.bazelable = true
- module.bazelHandler = &ccLibraryBazelHandler{module: module}
return module.Init()
}
diff --git a/cc/library_headers.go b/cc/library_headers.go
index 064e2b8..70e4715 100644
--- a/cc/library_headers.go
+++ b/cc/library_headers.go
@@ -104,8 +104,6 @@
func prebuiltLibraryHeaderFactory() android.Module {
module, library := NewPrebuiltLibrary(android.HostAndDeviceSupported, "")
library.HeaderOnly()
- module.bazelable = true
- module.bazelHandler = &ccLibraryBazelHandler{module: module}
return module.Init()
}