summaryrefslogtreecommitdiff
path: root/build_tools
diff options
context:
space:
mode:
authorBadalyan Vyacheslav <v.badalyan@open-bs.ru>2016-02-10 02:57:38 +0000
committerBadalian Vyacheslav <v.badalyan@open-bs.ru>2016-02-09 22:15:33 -0600
commite9e896abd1f1abae526319fdfd474ae1c28fed52 (patch)
tree072e3c2ad7afddc10f800c2c17195b75e4bf0b5c /build_tools
parent93e8ed01544bb1b9cba1dc24b06e157e3add9e23 (diff)
Build: Fix menuselect USAN conflicts
USAN can be used together with other sanitizers. Reported by: Badalyan Vyacheslav Tested by: Badalyan Vyacheslav Change-Id: I3bffa350d70965c3026651dba3a12414d0aaa45f
Diffstat (limited to 'build_tools')
-rw-r--r--build_tools/cflags.xml6
1 files changed, 0 insertions, 6 deletions
diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml
index d11fb22e5..54e8ba750 100644
--- a/build_tools/cflags.xml
+++ b/build_tools/cflags.xml
@@ -88,7 +88,6 @@
<support_level>extended</support_level>
<conflict>THREAD_SANITIZER</conflict>
<conflict>LEAK_SANITIZER</conflict>
- <conflict>UNDEFINED_SANITIZER</conflict>
<conflict>MALLOC_DEBUG</conflict>
<conflict>DEBUG_CHAOS</conflict>
</member>
@@ -96,21 +95,16 @@
<support_level>extended</support_level>
<conflict>ADDRESS_SANITIZER</conflict>
<conflict>LEAK_SANITIZER</conflict>
- <conflict>UNDEFINED_SANITIZER</conflict>
</member>
<member name="LEAK_SANITIZER" displayname="Leak Sanitizer">
<support_level>extended</support_level>
<conflict>ADDRESS_SANITIZER</conflict>
<conflict>THREAD_SANITIZER</conflict>
- <conflict>UNDEFINED_SANITIZER</conflict>
<conflict>MALLOC_DEBUG</conflict>
<conflict>DEBUG_CHAOS</conflict>
</member>
<member name="UNDEFINED_SANITIZER" displayname="Undefined Behavior Sanitizer">
<support_level>extended</support_level>
- <conflict>ADDRESS_SANITIZER</conflict>
- <conflict>THREAD_SANITIZER</conflict>
- <conflict>LEAK_SANITIZER</conflict>
</member>
<member name="BUSYDETECT_TONEONLY" displayname="Enable additional comparision of only the tone duration not the silence part">
<conflict>BUSYDETECT_COMPARE_TONE_AND_SILENCE</conflict>