tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "bp2build: convert host & prebuilt header libraries"

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/bazel.go
View file

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

@ -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)

2
cc/library.go
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()
}

2
cc/library_headers.go
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()
}