diff options
| author | Dan Albert <danalbert@google.com> | 2014-10-23 03:17:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-23 03:17:29 +0000 |
| commit | 2d21a0aa555a5fbffee4a6c0ce9bfd2463cdda6c (patch) | |
| tree | b5abff84c34d04e6077d322d344ce7935b0536f4 | |
| parent | 67a120112e6de3b5a14768e96884c58ad35b1405 (diff) | |
| parent | 9039c1a1dafbd5508aac8cb5af4268577a4bddd1 (diff) | |
| download | libpng-2d21a0aa555a5fbffee4a6c0ce9bfd2463cdda6c.tar.gz | |
am 9039c1a1: Merge "Never build libpng.a with ASAN."
* commit '9039c1a1dafbd5508aac8cb5af4268577a4bddd1':
Never build libpng.a with ASAN.
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index 86e63e152..944462017 100644 --- a/Android.mk +++ b/Android.mk @@ -56,6 +56,7 @@ common_COPY_HEADERS := png.h pngconf.h pngusr.h # ===================================================== include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_SRC_FILES := $(common_SRC_FILES) LOCAL_CFLAGS += $(common_CFLAGS) @@ -74,6 +75,7 @@ include $(BUILD_HOST_STATIC_LIBRARY) # ===================================================== include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CLANG := true LOCAL_SRC_FILES := $(common_SRC_FILES) LOCAL_CFLAGS += $(common_CFLAGS) -ftrapv @@ -82,6 +84,7 @@ LOCAL_ASFLAGS += $(common_ASFLAGS) LOCAL_SRC_FILES_arm := $(my_src_files_arm) LOCAL_CFLAGS_arm64 := $(my_cflags_arm64) LOCAL_SRC_FILES_arm64 := $(my_src_files_arm) +LOCAL_ADDRESS_SANITIZER := false LOCAL_C_INCLUDES += $(common_C_INCLUDES) \ external/zlib @@ -96,6 +99,7 @@ include $(BUILD_STATIC_LIBRARY) # ===================================================== include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CLANG := true LOCAL_SRC_FILES := $(common_SRC_FILES) LOCAL_CFLAGS += $(common_CFLAGS) -ftrapv @@ -121,6 +125,7 @@ include $(BUILD_SHARED_LIBRARY) # ===================================================== include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CLANG := true LOCAL_C_INCLUDES:= $(common_C_INCLUDES) external/zlib LOCAL_SRC_FILES:= pngtest.c |