Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c744ef55 authored by Evgenii Stepanov's avatar Evgenii Stepanov
Browse files

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
parent 57bd480c

liblog/Android.mk

+6 −0
Original line number Diff line number Diff line
@@ -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))