From 282881683fd005b535ecb1fb18e9143227f098da Mon Sep 17 00:00:00 2001 From: Jingwen Chen Date: Wed, 28 Apr 2021 07:19:54 +0000 Subject: [PATCH] bp2build: convert //external/arm-optimized-routines/... Also update modules in denylist that depend on arm-optimized-routines libraries. Bug: 186388919 Test: bazel build //external/arm-optimized-routines/... Test: TH Change-Id: If449b30288a4f852e5fcf31d923eda6cec1eb043 --- android/bazel.go | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/android/bazel.go b/android/bazel.go index f50b31d03..11fc2b6b5 100644 --- a/android/bazel.go +++ b/android/bazel.go @@ -168,19 +168,19 @@ var ( "external/gwp_asan": Bp2BuildDefaultTrueRecursively, "system/core/libcutils": Bp2BuildDefaultTrueRecursively, "system/core/property_service/libpropertyinfoparser": Bp2BuildDefaultTrueRecursively, - "system/libbase": Bp2BuildDefaultTrueRecursively, - "system/logging/liblog": Bp2BuildDefaultTrueRecursively, + "system/libbase": Bp2BuildDefaultTrueRecursively, + "system/logging/liblog": Bp2BuildDefaultTrueRecursively, + "external/arm-optimized-routines": Bp2BuildDefaultTrueRecursively, } // Per-module denylist to always opt modules out of both bp2build and mixed builds. bp2buildModuleDoNotConvertList = []string{ - // Things that transitively depend on //external/arm-optimized-routines. That one fails - // with a linker error: "ld.lld: no input files" + // Things that transitively depend on unconverted libc_* modules. "libc_common", // ruperts@, cc_library_static, depends on //bionic/libc:libc_nopthread "libc_common_static", // ruperts@, cc_library_static, depends on //bionic/libc:libc_common "libc_common_shared", // ruperts@, cc_library_static, depends on //bionic/libc:libc_common "libc_nomalloc", // ruperts@, cc_library_static, depends on //bionic/libc:libc_common - "libc_nopthread", // ruperts@, cc_library_static, depends on //external/arm-optimized-routine + "libc_nopthread", // ruperts@, cc_library_static, depends on lib_bionic_ndk, libc_syscalls, libc_tzcode, libstdc++ // Things that transitively depend on //system/libbase. libbase doesn't work because: // fmtlib: fatal error: 'cassert' file not found @@ -225,11 +225,12 @@ var ( // Per-module denylist to opt modules out of mixed builds. Such modules will // still be generated via bp2build. mixedBuildsDisabledList = []string{ - "libc_gdtoa", // ruperts@, cc_library_static, OK for bp2build but undefined symbol: __strtorQ for mixed builds - "libc_netbsd", // lberki@, cc_library_static, version script assignment of 'LIBC_PRIVATE' to symbol 'SHA1Final' failed: symbol not defined - "libc_openbsd", // ruperts@, cc_library_static, OK for bp2build but error: duplicate symbol: strcpy for mixed builds - "libsystemproperties", // cparsons@, cc_library_static, wrong include paths - "libpropertyinfoparser", // cparsons@, cc_library_static, wrong include paths + "libc_gdtoa", // ruperts@, cc_library_static, OK for bp2build but undefined symbol: __strtorQ for mixed builds + "libc_netbsd", // lberki@, cc_library_static, version script assignment of 'LIBC_PRIVATE' to symbol 'SHA1Final' failed: symbol not defined + "libc_openbsd", // ruperts@, cc_library_static, OK for bp2build but error: duplicate symbol: strcpy for mixed builds + "libsystemproperties", // cparsons@, cc_library_static, wrong include paths + "libpropertyinfoparser", // cparsons@, cc_library_static, wrong include paths + "libarm-optimized-routines-string", // jingwen@, cc_library_static, OK for bp2build but b/186615213 (asflags not handled in bp2build), version script assignment of 'LIBC' to symbol 'memcmp' failed: symbol not defined (also for memrchr, strnlen) } // Used for quicker lookups