Revert "bp2build: convert host & prebuilt header libraries"

This reverts commit d8a72d7dc9.

Reason for revert: root cause for b/214013899

Change-Id: If769708408c419c2fd3d9484fbf40202b7276299
This commit is contained in:
Jingwen Chen
2022-01-11 12:30:20 +00:00
parent d8a72d7dc9
commit 105deedfc7
4 changed files with 3 additions and 7 deletions

View File

@@ -3476,7 +3476,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)

View File

@@ -443,8 +443,6 @@ func LibraryHostStaticFactory() android.Module {
module, library := NewLibrary(android.HostSupported)
library.BuildOnlyStatic()
module.sdkMemberTypes = []android.SdkMemberType{staticLibrarySdkMemberType}
module.bazelable = true
module.bazelHandler = &ccLibraryBazelHandler{module: module}
return module.Init()
}

View File

@@ -104,8 +104,6 @@ func LibraryHeaderFactory() android.Module {
func prebuiltLibraryHeaderFactory() android.Module {
module, library := NewPrebuiltLibrary(android.HostAndDeviceSupported, "")
library.HeaderOnly()
module.bazelable = true
module.bazelHandler = &ccLibraryBazelHandler{module: module}
return module.Init()
}