From e8489563ffd5b618b57be39411f4e1ee5982a24d Mon Sep 17 00:00:00 2001 From: Jingwen Chen Date: Thu, 3 Jun 2021 11:54:54 +0000 Subject: [PATCH] bp2build: build libc.so. Test: TH Bug: 183064430 Change-Id: Idfcf80b2415c23840d4b4ae9b826cf6f061dbef3 --- android/bazel.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/android/bazel.go b/android/bazel.go index d396561ab..b9d707090 100644 --- a/android/bazel.go +++ b/android/bazel.go @@ -179,7 +179,6 @@ var ( // also depends on //system/libziparchive:libziparchive (http://b/186823656) // also depends on //system/logging/liblog:liblog (http://b/186822772) "libc_ndk", // http://b/187013218, cc_library_static, depends on //bionic/libm:libm (http://b/183064661) - "libc", // http://b/183064430, cc_library, depends on //external/jemalloc_new:libjemalloc5 (http://b/186828626) "libc_malloc_hooks", // http://b/187016307, cc_library, ld.lld: error: undefined symbol: __malloc_hook "libm", // http://b/183064661, cc_library, math.h:25:16: error: unexpected token in argument list @@ -220,9 +219,9 @@ var ( // Per-module denylist to opt modules out of mixed builds. Such modules will // still be generated via bp2build. mixedBuildsDisabledList = []string{ - // Currently empty, though should remain present to facilitate granular bp2build migration. - "libdl", // missing libbionic_Slinker_Slibld-android_Ubp2build_Ucc_Ulibrary_Ushared.so - "libdl_android", // missing libbionic_Slinker_Slibld-android_Ubp2build_Ucc_Ulibrary_Ushared.so + "libc", // b/190211183, missing libbionic_Slibdl_Sliblibdl_Ubp2build_Ucc_Ulibrary_Ushared.so + "libdl", // b/190211183, missing libbionic_Slinker_Slibld-android_Ubp2build_Ucc_Ulibrary_Ushared.so + "libdl_android", // b/190211183, missing libbionic_Slinker_Slibld-android_Ubp2build_Ucc_Ulibrary_Ushared.so } // Used for quicker lookups