Merge "Don't pass -Wl,--no-undefined to host targets" am: fe3e1818e5

am: 44d966cf6a

Change-Id: Ibbc6d1e83fb8f7ab32fef86c43ea30700f853815

core/binary.mk

@@ -64,10 +64,11 @@ else
   my_native_coverage := false
 endif
 
+my_allow_undefined_symbols := $(strip $(LOCAL_ALLOW_UNDEFINED_SYMBOLS))
+ifdef SANITIZE_HOST
 ifdef LOCAL_IS_HOST_MODULE
 my_allow_undefined_symbols := true
-else
-my_allow_undefined_symbols := $(strip $(LOCAL_ALLOW_UNDEFINED_SYMBOLS))
+endif
 endif
 
 my_ndk_sysroot :=
@@ -626,8 +627,17 @@ endif
 # up if --no-undefined is passed to the linker.
 ifeq ($(strip $(LOCAL_NO_DEFAULT_COMPILER_FLAGS)),)
   ifeq ($(my_allow_undefined_symbols),)
+    ifneq ($(HOST_OS),darwin)
       my_ldflags += -Wl,--no-undefined
     endif
+  else
+    ifdef LOCAL_IS_HOST_MODULE
+      ifeq ($(HOST_OS),darwin)
+        # darwin defaults to treating undefined symbols as errors
+        my_ldflags += -Wl,-undefined,dynamic_lookup
+      endif
+    endif
+  endif
 endif
 
 ifeq (true,$(LOCAL_GROUP_STATIC_LIBRARIES))