From cd7a74b4528609cf041543e27e98aa8ba73ff5b1 Mon Sep 17 00:00:00 2001 From: Christian Holler Date: Wed, 24 Jul 2019 14:13:30 +0000 Subject: [PATCH] Bug 1499041 - Remove libFuzzer flags from ipc/chromium/. r=froydnj Differential Revision: https://phabricator.services.mozilla.com/D39165 --HG-- extra : moz-landing-system : lando --- accessible/ipc/other/moz.build | 3 +++ dom/file/ipc/moz.build | 3 +++ dom/media/ipc/moz.build | 3 +++ dom/payments/ipc/moz.build | 3 +++ dom/plugins/ipc/moz.build | 3 +++ ipc/chromium/chromium-config.mozbuild | 4 ---- ipc/chromium/moz.build | 3 --- 7 files changed, 15 insertions(+), 7 deletions(-) diff --git a/accessible/ipc/other/moz.build b/accessible/ipc/other/moz.build index bf59b195f46c..b8753c9e8087 100644 --- a/accessible/ipc/other/moz.build +++ b/accessible/ipc/other/moz.build @@ -44,6 +44,9 @@ if CONFIG['ACCESSIBILITY']: include('/ipc/chromium/chromium-config.mozbuild') +# Add libFuzzer configuration directives +include('/tools/fuzzing/libfuzzer-config.mozbuild') + if CONFIG['CC_TYPE'] in ('clang', 'gcc'): CXXFLAGS += ['-Wno-error=shadow'] diff --git a/dom/file/ipc/moz.build b/dom/file/ipc/moz.build index d5bbb24bd1ce..665dc0640461 100644 --- a/dom/file/ipc/moz.build +++ b/dom/file/ipc/moz.build @@ -59,6 +59,9 @@ LOCAL_INCLUDES += [ include('/ipc/chromium/chromium-config.mozbuild') +# Add libFuzzer configuration directives +include('/tools/fuzzing/libfuzzer-config.mozbuild') + FINAL_LIBRARY = 'xul' CXXFLAGS += CONFIG['TK_CFLAGS'] diff --git a/dom/media/ipc/moz.build b/dom/media/ipc/moz.build index 91a224d08fd5..45158c6da8fa 100644 --- a/dom/media/ipc/moz.build +++ b/dom/media/ipc/moz.build @@ -56,5 +56,8 @@ LOCAL_INCLUDES += [ include('/ipc/chromium/chromium-config.mozbuild') +# Add libFuzzer configuration directives +include('/tools/fuzzing/libfuzzer-config.mozbuild') + FINAL_LIBRARY = 'xul' diff --git a/dom/payments/ipc/moz.build b/dom/payments/ipc/moz.build index 86d76c257fc2..07125450563c 100644 --- a/dom/payments/ipc/moz.build +++ b/dom/payments/ipc/moz.build @@ -20,4 +20,7 @@ IPDL_SOURCES += [ include('/ipc/chromium/chromium-config.mozbuild') +# Add libFuzzer configuration directives +include('/tools/fuzzing/libfuzzer-config.mozbuild') + FINAL_LIBRARY = 'xul' diff --git a/dom/plugins/ipc/moz.build b/dom/plugins/ipc/moz.build index 619c40ab6ae3..ccc2eabb4715 100644 --- a/dom/plugins/ipc/moz.build +++ b/dom/plugins/ipc/moz.build @@ -121,6 +121,9 @@ IPDL_SOURCES += [ include('/ipc/chromium/chromium-config.mozbuild') +# Add libFuzzer configuration directives +include('/tools/fuzzing/libfuzzer-config.mozbuild') + FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ '../base', diff --git a/ipc/chromium/chromium-config.mozbuild b/ipc/chromium/chromium-config.mozbuild index 1dd914f29480..d040efc2644a 100644 --- a/ipc/chromium/chromium-config.mozbuild +++ b/ipc/chromium/chromium-config.mozbuild @@ -69,7 +69,3 @@ else: else: DEFINES['OS_LINUX'] = 1 - - -# Add libFuzzer configuration directives -include('/tools/fuzzing/libfuzzer-config.mozbuild') diff --git a/ipc/chromium/moz.build b/ipc/chromium/moz.build index 3766f259e572..4ccc09db96c3 100644 --- a/ipc/chromium/moz.build +++ b/ipc/chromium/moz.build @@ -128,6 +128,3 @@ FINAL_LIBRARY = 'xul' if CONFIG['CC_TYPE'] in ('clang', 'gcc'): CXXFLAGS += ['-Wno-error=shadow'] - -# Add libFuzzer configuration directives -include('/tools/fuzzing/libfuzzer-config.mozbuild')