diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml index 43f7d5612331f68fbee66b3c828434678ba999a2..557ea39c8462e990c026a9ae3f28eeaf6bc4725a 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>