commit 1afb0701ab5098f30919edfcf8f89ce012380261
author Dan Albert <danalbert@google.com> Tue Oct 21 11:10:48 2014 -0700
committer Dan Albert <danalbert@google.com> Tue Oct 21 11:10:48 2014 -0700
tree 9bc497843f31f4470362b007e542abc070fd5157
parent c7a998190d8d05ef2a2d3afb3e633b19529eabba

Never build libpng.a with ASAN.

This library is used in some static executables that cannot use ASAN
(charger).

Change-Id: I9e62064263e9f22a757ef5d81b5f41147e12b121

Android.mk

diff --git a/Android.mk b/Android.mk
index 86e63e1..9444620 100644
--- a/Android.mk
+++ b/Android.mk
@@ -56,6 +56,7 @@
 # =====================================================
 
 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 $(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_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 $(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 $(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