Revert "Revert "bp2build: convert host & prebuilt header libraries""
This reverts commit 105deedfc7879a0e2d2c1ed9f0dcb7793b716513.
Reason for revert: Revert with forward fix
Change-Id: Ib0b6f6b1cbb011b4c5f2133e1cc15ec76ff29253
diff --git a/android/bazel.go b/android/bazel.go
index 970ad0d..9f38c3b 100644
--- a/android/bazel.go
+++ b/android/bazel.go
@@ -435,6 +435,8 @@
"abb", // depends on unconverted modules: libcmd, libbinder
"adb", // depends on unconverted modules: AdbWinApi, libadb_host, libandroidfw, libapp_processes_protos_full, libfastdeploy_host, libopenscreen-discovery, libopenscreen-platform-impl, libusb, bin2c_fastdeployagent, AdbWinUsbApi
+ "libadb_host", // depends on unconverted modules: libopenscreen-discovery, libopenscreen-platform-impl, libusb, AdbWinApi
+ "libfastdeploy_host", // depends on unconverted modules: libandroidfw, libusb, AdbWinApi
"linker", // depends on unconverted modules: libdebuggerd_handler_fallback
"linker_reloc_bench_main", // depends on unconverted modules: liblinker_reloc_bench_*
"versioner", // depends on unconverted modules: libclang_cxx_host, libLLVM_host, of unsupported type llvm_host_prebuilt_library_shared
diff --git a/cc/cc.go b/cc/cc.go
index 281ebc1..82b7c87 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -3476,9 +3476,7 @@
libraryBp2Build(ctx, c)
}
} else if !static && !shared {
- if !prebuilt {
- libraryHeadersBp2Build(ctx, c)
- }
+ libraryHeadersBp2Build(ctx, c)
} else if static {
if prebuilt {
prebuiltLibraryStaticBp2Build(ctx, c)
diff --git a/cc/library.go b/cc/library.go
index 5720944..b18f90d 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -443,6 +443,8 @@
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 70e4715..064e2b8 100644
--- a/cc/library_headers.go
+++ b/cc/library_headers.go
@@ -104,6 +104,8 @@
func prebuiltLibraryHeaderFactory() android.Module {
module, library := NewPrebuiltLibrary(android.HostAndDeviceSupported, "")
library.HeaderOnly()
+ module.bazelable = true
+ module.bazelHandler = &ccLibraryBazelHandler{module: module}
return module.Init()
}