Build: Fix menuselect USAN conflicts

USAN can be used together with other sanitizers.

Reported by: Badalyan Vyacheslav
Tested by: Badalyan Vyacheslav

Change-Id: I3bffa350d70965c3026651dba3a12414d0aaa45f

diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml
index b5c447be6abbd6b442ddb59d8298281fcfd41ef9..5e06ed96bce110472397a790f89637f166dfecfd 100644 (file)
--- a/build_tools/cflags.xml
+++ b/build_tools/cflags.xml
@@ -67,27 +67,21 @@
                        <support_level>extended</support_level>
                        <conflict>THREAD_SANITIZER</conflict>
                        <conflict>LEAK_SANITIZER</conflict>
-                       <conflict>UNDEFINED_SANITIZER</conflict>
                        <conflict>MALLOC_DEBUG</conflict>
                </member>
                <member name="THREAD_SANITIZER" displayname="Thread Sanitizer">
                        <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>
                </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>