resolved conflicts for merge of 96c22133 to lmp-mr1-dev-plus-aosp

Change-Id: Ia94c5ad273c3578433d3eb226e8e8de7c1921d34

diff --cc core/binary.mk
index ed09a24,6db8ae4..e36f117
--- 1/core/binary.mk
--- 2/core/binary.mk
+++ b/core/binary.mk
@@@ -179,12 -179,21 +179,23 @@@ endi
  
  ifeq ($(strip $(LOCAL_ADDRESS_SANITIZER)),true)
    my_clang := true
 +  # Frame pointer based unwinder in ASan requires ARM frame setup.
 +  LOCAL_ARM_MODE := arm
    my_cflags += $(ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS)
    my_ldflags += $(ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS)
-   my_shared_libraries += $(ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES)
-   my_static_libraries += $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES)
+   ifdef LOCAL_IS_HOST_MODULE
+       my_ldlibs += $(ADDRESS_SANITIZER_CONFIG_EXTRA_LDLIBS_HOST)
+       my_shared_libraries += \
+           $(ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES_HOST)
+       my_static_libraries += \
+           $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES_HOST)
+   else
+       my_ldlibs += $(ADDRESS_SANITIZER_CONFIG_EXTRA_LDLIBS_TARGET)
+       my_shared_libraries += \
+           $(ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES_TARGET)
+       my_static_libraries += \
+           $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES_TARGET)
+   endif
  endif
  
  ifeq ($(strip $($(LOCAL_2ND_ARCH_VAR_PREFIX)WITHOUT_$(my_prefix)CLANG)),true)

diff --cc core/clang/config.mk
index d07df70,246690f..37eeae1
--- 1/core/clang/config.mk
--- 2/core/clang/config.mk
+++ b/core/clang/config.mk
@@@ -90,11 -90,16 +90,17 @@@ include $(BUILD_SYSTEM)/clang/TARGET_$(
  endif
  
  # Address sanitizer clang config
 -ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS := -fsanitize=address
 +ADDRESS_SANITIZER_RUNTIME_LIBRARY := libclang_rt.asan_$(TARGET_ARCH)_android
 +ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS := -fsanitize=address -fno-omit-frame-pointer
  ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS := -Wl,-u,__asan_preinit
- ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES := libdl $(ADDRESS_SANITIZER_RUNTIME_LIBRARY)
- ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES := libasan
+ 
+ ADDRESS_SANITIZER_CONFIG_EXTRA_LDLIBS_HOST := -lpthread -ldl
+ ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES_HOST :=
+ ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES_HOST := libasan
+ 
+ ADDRESS_SANITIZER_CONFIG_EXTRA_LDLIBS_TARGET :=
 -ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES_TARGET := libdl libasan_preload
++ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES_TARGET := libdl $(ADDRESS_SANITIZER_RUNTIME_LIBRARY)
+ ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES_TARGET := libasan
  
  # This allows us to use the superset of functionality that compiler-rt
  # provides to Clang (for supporting features like -ftrapv).