Merge "Use ld when lld fails"

am: e3b149c754 Change-Id: Ic145eb368b83d9ea7996737f431f81e2ecf5d608
2018-04-16 17:44:54 -07:00 · 2018-04-16 17:44:54 -07:00 · f5f128ea90
parent 6575d86d3d e3b149c754
commit f5f128ea90
1 changed files with 6 additions and 0 deletions
--- a/libmemunreachable/Android.bp
+++ b/libmemunreachable/Android.bp
@ -46,6 +46,12 @@ cc_library {
            static_libs: ["libunwind_llvm"],
        },
    },
+
+    // TODO(b/78118944), 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.
+    use_clang_lld: false,
+
    export_include_dirs: ["include"],
    local_include_dirs: ["include"],
 }