From 6036497a3cd6c0279b15c3a2504240360ba90ab8 Mon Sep 17 00:00:00 2001 From: Rupert Shuttleworth Date: Tue, 27 Apr 2021 11:03:39 -0400 Subject: [PATCH] Remove libdl_static from the deny list in light of http://aosp/1688405 Unfortunately libdl has to stay on the deny list due to an unrelated clang error in CI. Test: bazel build //bionic/... now works with libdl and libdl_static both removed from the deny list. Test: ./build/bazel/ci/bp2build.sh passes locally Change-Id: I1b3c3dd01bc535c73c2e88c81b7998fa7906b4c5 --- android/bazel.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/android/bazel.go b/android/bazel.go index 218bbc12d..e436a7e12 100644 --- a/android/bazel.go +++ b/android/bazel.go @@ -200,7 +200,7 @@ var ( // Linker error "libc_malloc_hooks", // jingwen@, cc_library, undefined symbol: __malloc_hook, etc. - "libdl", // jingwen@, cc_library, no input files + "libdl", // jingwen@, cc_library, clang failed "libstdc++", // jingwen@, cc_library, undefined symbol: free // Includes not found @@ -213,7 +213,6 @@ var ( "libBionicBenchmarksUtils", // ruperts@, cc_library_static, 'map' file not found "libc_syscalls", // ruperts@, cc_library_static, mutator panic cannot get direct dep syscalls-arm64.S of libc_syscalls "libc_ndk", // ruperts@, cc_library_static, depends on libc_bionic_ndk, libc_jemalloc_wrapper, libc_syscalls, libc_tzcode, libstdc++ - "libdl_static", // ruperts@, cc_library_static, conflicts with libdl "libc", // jingwen@, cc_library, depends on //external/gwp_asan }