diff options
| author | Evgenii Stepanov <eugenis@google.com> | 2015-05-01 10:21:08 -0700 |
|---|---|---|
| committer | Evgenii Stepanov <eugenis@google.com> | 2015-05-22 11:28:35 -0700 |
| commit | 868d8c59915273d0021182bb77f94f4d66811b64 (patch) | |
| tree | 9ff7a181fb7623eeb9da9ce15b786e7a71c820fc | |
| parent | 99141a696f5fd4611e48d480606ef9e3b3ca3c0a (diff) | |
| download | compiler-rt-868d8c59915273d0021182bb77f94f4d66811b64.tar.gz | |
Do not limit ASan modules to -eng build.
So that -userdebug could be built with ASan as well and -eng.
Change-Id: Ia1ff7158f9b2e0dceee268b013fecd2d55944b73
| -rw-r--r-- | lib/asan/Android.mk | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/asan/Android.mk b/lib/asan/Android.mk index 6bec7039c..63c630337 100644 --- a/lib/asan/Android.mk +++ b/lib/asan/Android.mk @@ -129,7 +129,6 @@ ifeq ($(TARGET_ARCH),arm) include $(CLEAR_VARS) LOCAL_MODULE := libasan -LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := \ external/compiler-rt/lib \ external/compiler-rt/include @@ -147,7 +146,6 @@ define build-asan-rt-shared-library include $(CLEAR_VARS) LOCAL_MODULE := $(1) LOCAL_MULTILIB := $(2) -LOCAL_MODULE_TAGS := eng LOCAL_C_INCLUDES := \ external/compiler-rt/lib \ external/compiler-rt/include @@ -178,7 +176,6 @@ endif include $(CLEAR_VARS) LOCAL_MODULE := asanwrapper -LOCAL_MODULE_TAGS := eng LOCAL_SRC_FILES := asanwrapper.cc LOCAL_CPP_EXTENSION := .cc LOCAL_CPPFLAGS := -std=c++11 @@ -248,7 +245,6 @@ endif # ifeq($(TARGET_ARCH),arm) ifneq ($(HOST_OS),darwin) include $(CLEAR_VARS) LOCAL_MODULE := libasan -LOCAL_MODULE_TAGS := eng LOCAL_C_INCLUDES := external/compiler-rt/lib external/compiler-rt/include LOCAL_CFLAGS += $(asan_rtl_cflags) LOCAL_SRC_FILES := $(asan_rtl_files) @@ -262,7 +258,6 @@ include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := libasan_cxx -LOCAL_MODULE_TAGS := eng LOCAL_C_INCLUDES := external/compiler-rt/lib external/compiler-rt/include LOCAL_CFLAGS += $(asan_rtl_cflags) LOCAL_SRC_FILES := $(asan_rtl_cxx_files) |