Move lsan_check_in_progress definition to lsan_common.cc.

This commit fixes undefined reference error from libasan.so:

/lib/libasan.so: undefined reference to `lsan_check_in_progress'

occurred due to ASan runtime embeds part of LSan runtime and
misses lsan_check_in_progress symbol. To overcome the issue, just move
lsan_check_in_progress definition to lsan_common.cc.

Change-Id: I9ed7f4d490d525bbf7ce054285afaec24716f35a
Signed-off-by: Maxim Ostapenko <m.ostapenko@samsung.com>

diff --git a/libsanitizer/lsan/lsan.cc b/libsanitizer/lsan/lsan.cc
index 3c94c88..49b4432 100644 (file)
--- a/libsanitizer/lsan/lsan.cc
+++ b/libsanitizer/lsan/lsan.cc
@@ -21,7 +21,6 @@
 
 bool lsan_inited;
 bool lsan_init_is_running;
-bool lsan_check_in_progress;
 
 namespace __lsan {
 

diff --git a/libsanitizer/lsan/lsan_common.cc b/libsanitizer/lsan/lsan_common.cc
index 2340850..866e23f 100644 (file)
--- a/libsanitizer/lsan/lsan_common.cc
+++ b/libsanitizer/lsan/lsan_common.cc
@@ -24,6 +24,9 @@
 #include "sanitizer_common/sanitizer_report_decorator.h"
 
 #if CAN_SANITIZE_LEAKS
+// TODO (chefmax): Figure out how we can avoid pollutting global namespace.
+bool lsan_check_in_progress;
+
 namespace __lsan {
 
 // This mutex is used to prevent races between DoLeakCheck and IgnoreObject, and