Merge "Disable lld, failed to link bionic/linker."
diff --git a/libc/malloc_debug/Android.bp b/libc/malloc_debug/Android.bp
index 899987c..1a79802 100644
--- a/libc/malloc_debug/Android.bp
+++ b/libc/malloc_debug/Android.bp
@@ -61,6 +61,11 @@
},
},
+ // Clang lld link flags do not work with special link rules
+ // for libunwind_llvm yet. Linked aosp_arm-eng image failed to
+ // boot up in the emulator. http://b/78118944.
+ use_clang_lld: false,
+
static_libs: [
"libasync_safe",
"libbase",
diff --git a/tests/libs/Android.bp b/tests/libs/Android.bp
index ae5f78a..c1f1590 100644
--- a/tests/libs/Android.bp
+++ b/tests/libs/Android.bp
@@ -47,6 +47,7 @@
defaults: ["bionic_testlib_defaults"],
srcs: ["elf_tls_test_library.cpp"],
cflags: ["-fno-emulated-tls"],
+ allow_undefined_symbols: true, // __tls_get_addr is undefined.
}
// -----------------------------------------------------------------------------