From 105deedfc7879a0e2d2c1ed9f0dcb7793b716513 Mon Sep 17 00:00:00 2001 From: Jingwen Chen Date: Tue, 11 Jan 2022 12:30:20 +0000 Subject: [PATCH] Revert "bp2build: convert host & prebuilt header libraries" This reverts commit d8a72d7dc91b2122b7b10b47b80cf2f7c65f9049. Reason for revert: root cause for b/214013899 Change-Id: If769708408c419c2fd3d9484fbf40202b7276299 --- android/bazel.go | 2 -- cc/cc.go | 4 +++- cc/library.go | 2 -- cc/library_headers.go | 2 -- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/android/bazel.go b/android/bazel.go index 9f38c3b63..970ad0d71 100644 --- a/android/bazel.go +++ b/android/bazel.go @@ -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 diff --git a/cc/cc.go b/cc/cc.go index 82b7c8795..281ebc12a 100644 --- a/cc/cc.go +++ b/cc/cc.go @@ -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) diff --git a/cc/library.go b/cc/library.go index b18f90dbe..5720944ab 100644 --- a/cc/library.go +++ b/cc/library.go @@ -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() } diff --git a/cc/library_headers.go b/cc/library_headers.go index 064e2b807..70e4715ad 100644 --- a/cc/library_headers.go +++ b/cc/library_headers.go @@ -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() }