diff options
| author | Evgenii Stepanov <eugenis@google.com> | 2015-06-11 14:39:57 -0700 |
|---|---|---|
| committer | Evgenii Stepanov <eugenis@google.com> | 2015-06-12 14:18:33 -0700 |
| commit | c744ef55478d7f4da37cb040f901cf3e9ec75dbb (patch) | |
| tree | db7c4d7d5bf169c8ec219ed8dd8c3b35040ad877 | |
| parent | 57bd480c3b7c506423c6016e977539213d4c0759 (diff) | |
| download | core-c744ef55478d7f4da37cb040f901cf3e9ec75dbb.tar.gz core-c744ef55478d7f4da37cb040f901cf3e9ec75dbb.tar.bz2 core-c744ef55478d7f4da37cb040f901cf3e9ec75dbb.zip | |
Fix SANITIZE_TARGET build of liblog.
* liblog does not use STL, don't link it.
* ASan runtime library depends on liblog, hence liblog can never be
sanitized.
Bug: 21785137
Change-Id: I1e97378c61d4d18d740287f5f0881427aa7cc227
| -rw-r--r-- | liblog/Android.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/liblog/Android.mk b/liblog/Android.mk index d7766f544..ce282bd4a 100644 --- a/liblog/Android.mk +++ b/liblog/Android.mk @@ -68,6 +68,7 @@ ifeq ($(strip $(HOST_OS)),linux) LOCAL_LDLIBS := -lrt endif LOCAL_MULTILIB := both +LOCAL_CXX_STL := none include $(BUILD_HOST_SHARED_LIBRARY) @@ -77,6 +78,8 @@ include $(CLEAR_VARS) LOCAL_MODULE := liblog LOCAL_SRC_FILES := $(liblog_target_sources) LOCAL_CFLAGS := -Werror $(liblog_cflags) +# AddressSanitizer runtime library depends on liblog. +LOCAL_SANITIZE := never include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) @@ -87,6 +90,9 @@ LOCAL_CFLAGS := -Werror $(liblog_cflags) # TODO: This is to work around b/19059885. Remove after root cause is fixed LOCAL_LDFLAGS_arm := -Wl,--hash-style=both +LOCAL_SANITIZE := never +LOCAL_CXX_STL := none + include $(BUILD_SHARED_LIBRARY) include $(call first-makefiles-under,$(LOCAL_PATH)) |