commit 060c99c33e77e26387cc0f03e18f6d62537d7690
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jun 26 19:47:53 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 26 19:47:53 2018 +0000
tree d62711051e7df8dfb5a33ed3930fca80b22ff7b9
parent 7ef5d75009c037465ef40a18caec3dd17d791a14
parent b66f9e6f91dd6c87de3e8c2472ff58c308fc8ae1

Merge "Disable lld for windows host modules"

core/use_lld_setup.mk

diff --git a/core/use_lld_setup.mk b/core/use_lld_setup.mk
index d00a5d3..b0386d5 100644
--- a/core/use_lld_setup.mk
+++ b/core/use_lld_setup.mk
@@ -18,10 +18,14 @@
   endif
 endif
 
-# Do not use LLD for Darwin host executables or shared libraries.
-# See https://lld.llvm.org/AtomLLD.html for status of lld for Mach-O.
 ifeq ($(LOCAL_IS_HOST_MODULE),true)
+  # Do not use LLD for Darwin host executables or shared libraries.  See
+  # https://lld.llvm.org/AtomLLD.html for status of lld for Mach-O.
   ifeq ($(HOST_OS),darwin)
     my_use_clang_lld := false
   endif
+  # http://b/110800681 - lld cannot link Android's Windows modules yet.
+  ifeq ($(HOST_CROSS_OS),windows)
+    my_use_clang_lld := false
+  endif
 endif