commit 6880f936173081297be0dc12f687d341b86a4cfa
author Treehugger Robot <treehugger-gerrit@google.com> Mon Apr 16 23:04:06 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 16 23:04:06 2018 +0000
tree 54a498992e4f65335d41a0f3fe55d9ea20d68048
parent 6c1d8475146bdc35edd0765c0de9da0f220c6712
parent 73de62e461c688dd956b1a1fc1042cb75bf10e08

Merge "Disable lld, failed to link bionic/linker."

libc/malloc_debug/Android.bp

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",

tests/libs/Android.bp

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.
 }
 
 // -----------------------------------------------------------------------------