From 5ba672ebcb0bbb77f22bbc6c98ec03867ac1711d Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 17 Oct 2014 10:33:25 -0700 Subject: [PATCH] Never use ASAN. Unless we completely redo how we build bionic (so that the object files for libc.so get built separately from libc.a), we can't enable ASAN here, as libc.a gets linked into static executables. Change-Id: I2ce4f51248bd51c4213a555ff481b6faabbf53f8 --- libc/Android.mk | 20 ++++++++++++++++++++ tests/Android.build.mk | 1 + 2 files changed, 21 insertions(+) diff --git a/libc/Android.mk b/libc/Android.mk index 330e51758..e24931b4b 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -605,6 +605,7 @@ LOCAL_CLANG := $(use_clang) LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies) LOCAL_CXX_STL := none LOCAL_SYSTEM_SHARED_LIBRARIES := +LOCAL_ADDRESS_SANITIZER := false LOCAL_NATIVE_COVERAGE := $(bionic_coverage) $(eval $(call patch-up-arch-specific-flags,LOCAL_CFLAGS,libc_common_cflags)) @@ -645,6 +646,7 @@ LOCAL_CLANG := $(use_clang) LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies) LOCAL_CXX_STL := none LOCAL_SYSTEM_SHARED_LIBRARIES := +LOCAL_ADDRESS_SANITIZER := false LOCAL_NATIVE_COVERAGE := $(bionic_coverage) $(eval $(call patch-up-arch-specific-flags,LOCAL_CFLAGS,libc_common_cflags)) @@ -689,6 +691,7 @@ LOCAL_CLANG := $(use_clang) LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies) LOCAL_CXX_STL := none LOCAL_SYSTEM_SHARED_LIBRARIES := +LOCAL_ADDRESS_SANITIZER := false LOCAL_NATIVE_COVERAGE := $(bionic_coverage) $(eval $(call patch-up-arch-specific-flags,LOCAL_CFLAGS,libc_common_cflags)) @@ -720,6 +723,7 @@ LOCAL_CLANG := $(use_clang) LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies) LOCAL_CXX_STL := none LOCAL_SYSTEM_SHARED_LIBRARIES := +LOCAL_ADDRESS_SANITIZER := false LOCAL_NATIVE_COVERAGE := $(bionic_coverage) $(eval $(call patch-up-arch-specific-flags,LOCAL_CFLAGS,libc_common_cflags)) @@ -753,6 +757,7 @@ LOCAL_CLANG := $(use_clang) LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies) LOCAL_CXX_STL := none LOCAL_SYSTEM_SHARED_LIBRARIES := +LOCAL_ADDRESS_SANITIZER := false LOCAL_NATIVE_COVERAGE := $(bionic_coverage) $(eval $(call patch-up-arch-specific-flags,LOCAL_CFLAGS,libc_common_cflags)) @@ -796,6 +801,7 @@ LOCAL_MODULE := libc_openbsd LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies) LOCAL_CXX_STL := none LOCAL_SYSTEM_SHARED_LIBRARIES := +LOCAL_ADDRESS_SANITIZER := false LOCAL_NATIVE_COVERAGE := $(bionic_coverage) $(eval $(call patch-up-arch-specific-flags,LOCAL_CFLAGS,libc_common_cflags)) @@ -837,6 +843,7 @@ LOCAL_MODULE := libc_gdtoa LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies) LOCAL_CXX_STL := none LOCAL_SYSTEM_SHARED_LIBRARIES := +LOCAL_ADDRESS_SANITIZER := false LOCAL_NATIVE_COVERAGE := $(bionic_coverage) $(eval $(call patch-up-arch-specific-flags,LOCAL_CFLAGS,libc_common_cflags)) @@ -866,6 +873,7 @@ LOCAL_CLANG := $(use_clang) LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies) LOCAL_CXX_STL := none LOCAL_SYSTEM_SHARED_LIBRARIES := +LOCAL_ADDRESS_SANITIZER := false LOCAL_NATIVE_COVERAGE := $(bionic_coverage) $(eval $(call patch-up-arch-specific-flags,LOCAL_CFLAGS,libc_common_cflags)) @@ -891,6 +899,7 @@ LOCAL_CLANG := true # GCC refuses to hide new/delete LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies) LOCAL_CXX_STL := none LOCAL_SYSTEM_SHARED_LIBRARIES := +LOCAL_ADDRESS_SANITIZER := false LOCAL_NATIVE_COVERAGE := $(bionic_coverage) include $(BUILD_STATIC_LIBRARY) @@ -911,6 +920,7 @@ LOCAL_CLANG := $(use_clang) LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies) LOCAL_CXX_STL := none LOCAL_SYSTEM_SHARED_LIBRARIES := +LOCAL_ADDRESS_SANITIZER := false LOCAL_NATIVE_COVERAGE := $(bionic_coverage) include $(BUILD_STATIC_LIBRARY) @@ -932,6 +942,7 @@ LOCAL_CFLAGS := $(libc_common_cflags) -fno-builtin LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies) LOCAL_CXX_STL := none LOCAL_SYSTEM_SHARED_LIBRARIES := +LOCAL_ADDRESS_SANITIZER := false LOCAL_NATIVE_COVERAGE := $(bionic_coverage) include $(BUILD_STATIC_LIBRARY) @@ -974,6 +985,7 @@ LOCAL_SYSTEM_SHARED_LIBRARIES := # TODO: split out the asflags. LOCAL_ASFLAGS := $(LOCAL_CFLAGS) +LOCAL_ADDRESS_SANITIZER := false LOCAL_NATIVE_COVERAGE := $(bionic_coverage) $(eval $(call patch-up-arch-specific-flags,LOCAL_CFLAGS,libc_common_cflags)) @@ -1012,6 +1024,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies) LOCAL_WHOLE_STATIC_LIBRARIES := libc_common LOCAL_CXX_STL := none LOCAL_SYSTEM_SHARED_LIBRARIES := +LOCAL_ADDRESS_SANITIZER := false LOCAL_NATIVE_COVERAGE := $(bionic_coverage) $(eval $(call patch-up-arch-specific-flags,LOCAL_CFLAGS,libc_common_cflags)) @@ -1034,6 +1047,7 @@ LOCAL_C_INCLUDES := $(libc_common_c_includes) LOCAL_MODULE := libc_malloc LOCAL_CLANG := $(use_clang) LOCAL_CXX_STL := none +LOCAL_ADDRESS_SANITIZER := false LOCAL_NATIVE_COVERAGE := $(bionic_coverage) LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies) include $(BUILD_STATIC_LIBRARY) @@ -1062,6 +1076,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies) LOCAL_WHOLE_STATIC_LIBRARIES := libc_common LOCAL_CXX_STL := none LOCAL_SYSTEM_SHARED_LIBRARIES := +LOCAL_ADDRESS_SANITIZER := false LOCAL_NATIVE_COVERAGE := $(bionic_coverage) $(eval $(call patch-up-arch-specific-flags,LOCAL_CFLAGS,libc_common_cflags)) @@ -1124,6 +1139,7 @@ LOCAL_SRC_FILES_arm += \ arch-common/bionic/crtbegin_so.c \ arch-arm/bionic/atexit_legacy.c \ arch-common/bionic/crtend_so.S +LOCAL_ADDRESS_SANITIZER := false LOCAL_NATIVE_COVERAGE := $(bionic_coverage) include $(BUILD_SHARED_LIBRARY) @@ -1171,6 +1187,7 @@ LOCAL_ALLOW_UNDEFINED_SYMBOLS := true # Don't install on release build LOCAL_MODULE_TAGS := eng debug +LOCAL_ADDRESS_SANITIZER := false LOCAL_NATIVE_COVERAGE := $(bionic_coverage) $(eval $(call patch-up-arch-specific-flags,LOCAL_CFLAGS,libc_common_cflags)) @@ -1205,6 +1222,7 @@ LOCAL_SYSTEM_SHARED_LIBRARIES := # Don't install on release build LOCAL_MODULE_TAGS := eng debug +LOCAL_ADDRESS_SANITIZER := false LOCAL_NATIVE_COVERAGE := $(bionic_coverage) $(eval $(call patch-up-arch-specific-flags,LOCAL_CFLAGS,libc_common_cflags)) @@ -1230,6 +1248,7 @@ LOCAL_MODULE:= libstdc++ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CXX_STL := none LOCAL_SYSTEM_SHARED_LIBRARIES := libc +LOCAL_ADDRESS_SANITIZER := false LOCAL_NATIVE_COVERAGE := $(bionic_coverage) include $(BUILD_SHARED_LIBRARY) @@ -1245,6 +1264,7 @@ LOCAL_MODULE:= libstdc++ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CXX_STL := none LOCAL_SYSTEM_SHARED_LIBRARIES := libc +LOCAL_ADDRESS_SANITIZER := false LOCAL_NATIVE_COVERAGE := $(bionic_coverage) include $(BUILD_STATIC_LIBRARY) diff --git a/tests/Android.build.mk b/tests/Android.build.mk index 78f07edcf..9c5df0e51 100644 --- a/tests/Android.build.mk +++ b/tests/Android.build.mk @@ -35,6 +35,7 @@ endif endif LOCAL_CLANG := $($(module)_clang_$(build_type)) +LOCAL_ADDRESS_SANITIZER := false LOCAL_FORCE_STATIC_EXECUTABLE := $($(module)_force_static_executable)