diff options
| author | Badalyan Vyacheslav <v.badalyan@open-bs.ru> | 2016-02-10 02:57:38 +0000 |
|---|---|---|
| committer | Badalian Vyacheslav <v.badalyan@open-bs.ru> | 2016-02-09 22:13:09 -0600 |
| commit | c7186c7f0a70203b77f42b7e6d6997141ab8cf34 (patch) | |
| tree | 4b9b3f6c7f8663115d8e959a0f79190262ca3a4e /build_tools | |
| parent | 68643f83cd213e87619fa2e0d11ef38c4b2d6b6a (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.xml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml index 43f7d5612..557ea39c8 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> |