StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Revert "bp2build: convert host & prebuilt header libraries""" am: e844132b85 am: 86151370ef am: d490d54259

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1944329

Change-Id: I7eb514bc4e0e98d0a8f77ee708d5356b86b921a3
This commit is contained in:
Liz Kammer
2022-01-12 14:05:28 +00:00
committed by Automerger Merge Worker
parent b55a98dd1f d490d54259
commit 4e491af625
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/bazel.go
View File

@@ -435,6 +435,8 @@ var (
"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

4
cc/cc.go
View File

@@ -3490,9 +3490,7 @@ func (c *Module) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
libraryBp2Build(ctx, c)
}
} else if !static && !shared {
if !prebuilt {
libraryHeadersBp2Build(ctx, c)
}
libraryHeadersBp2Build(ctx, c)
} else if static {
if prebuilt {
prebuiltLibraryStaticBp2Build(ctx, c)

2
cc/library.go
View File

@@ -443,6 +443,8 @@ 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()
}

2
cc/library_headers.go
View File

@@ -104,6 +104,8 @@ 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()
}