Build: Fix menuselect USAN conflicts
authorBadalyan Vyacheslav <v.badalyan@open-bs.ru>
Wed, 10 Feb 2016 02:57:38 +0000 (02:57 +0000)
committerBadalian Vyacheslav <v.badalyan@open-bs.ru>
Wed, 10 Feb 2016 04:13:09 +0000 (22:13 -0600)
USAN can be used together with other sanitizers.

Reported by: Badalyan Vyacheslav
Tested by: Badalyan Vyacheslav

Change-Id: I3bffa350d70965c3026651dba3a12414d0aaa45f

build_tools/cflags.xml

index 43f7d56..557ea39 100644 (file)
@@ -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>
                        <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>