commit e20b4bd98d879307e535cec7d6c8ac670acfaa79
author Jean-Baptiste Queru <jbq@google.com> Fri Aug 10 12:48:56 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 10 12:48:56 2012 -0700
tree 746b7fc610eeb9f56bb9494e39f69927e3562e52
parent cca3c6afa2152260d795e4d8802080b67c96c7ea
parent 2af13d061b168f46912c78a76f20bc3956422ca5

am 2af13d06: Merge "Add MIPS architecture support"

* commit '2af13d061b168f46912c78a76f20bc3956422ca5':
  Add MIPS architecture support

Android.mk

diff --git a/Android.mk b/Android.mk
index 7d1034e..4863e57 100644
--- a/Android.mk
+++ b/Android.mk
@@ -487,4 +487,9 @@
 # Including this will modify the include path
 include external/stlport/libstlport.mk
 
+ifneq ($(strip $(WITH_ADDRESS_SANITIZER)),)
+    LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/asan
+    LOCAL_ADDRESS_SANITIZER := true
+endif
+
 include $(BUILD_SHARED_LIBRARY)