Bug 1022684 - add -Wno-unused-local-typedefs to various bits of crashreporter building; r=mshal
--- a/toolkit/crashreporter/client/moz.build
+++ b/toolkit/crashreporter/client/moz.build
@@ -44,8 +44,10 @@ if CONFIG['MOZ_ENABLE_GTK']:
'crashreporter_unix_common.cpp'
]
RCINCLUDE = 'crashreporter.rc'
# Don't use the STL wrappers in the crashreporter clients; they don't
# link with -lmozalloc, and it really doesn't matter here anyway.
DISABLE_STL_WRAPPING = True
+
+include('/toolkit/crashreporter/crashreporter.mozbuild')
new file mode 100644
--- /dev/null
+++ b/toolkit/crashreporter/crashreporter.mozbuild
@@ -0,0 +1,15 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Suppress warnings in third-party code.
+if CONFIG['_MSC_VER']:
+ CXXFLAGS += [
+ '-wd4005', # macro redefinition
+ ]
+elif CONFIG['GNU_CXX']:
+ CXXFLAGS += [
+ '-Wno-unused-local-typedefs',
+ ]
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/moz.build
@@ -14,8 +14,10 @@ FINAL_LIBRARY = 'xulapp_s'
LOCAL_INCLUDES += [
'/toolkit/crashreporter/google-breakpad/src',
]
if CONFIG['OS_TARGET'] == 'Android':
LOCAL_INCLUDES += [
'/toolkit/crashreporter/google-breakpad/src/common/android/include',
]
+
+include('/toolkit/crashreporter/crashreporter.mozbuild')
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/moz.build
@@ -21,8 +21,9 @@ if CONFIG['OS_TARGET'] == 'Android':
LOCAL_INCLUDES += [
'/toolkit/crashreporter/google-breakpad/src/common/android/include',
]
LOCAL_INCLUDES += [
'/toolkit/crashreporter/google-breakpad/src',
]
+include('/toolkit/crashreporter/crashreporter.mozbuild')
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build
@@ -20,8 +20,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
LOCAL_INCLUDES += [
'/toolkit/crashreporter/google-breakpad/src',
]
if CONFIG['OS_TARGET'] == 'Android':
LOCAL_INCLUDES += [
'/toolkit/crashreporter/google-breakpad/src/common/android/include',
]
+
+include('/toolkit/crashreporter/crashreporter.mozbuild')
--- a/toolkit/crashreporter/google-breakpad/src/common/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/common/moz.build
@@ -83,12 +83,14 @@ MSVC_ENABLE_PGO = True
FINAL_LIBRARY = 'xulapp_s'
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
DEFINES['ELFSIZE'] = 32
if CONFIG['OS_TARGET'] == 'Android':
DEFINES['NO_STABS_SUPPORT'] = True
+include('/toolkit/crashreporter/crashreporter.mozbuild')
+
LOCAL_INCLUDES += [
'..',
]
--- a/toolkit/crashreporter/google-breakpad/src/processor/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/processor/moz.build
@@ -23,8 +23,9 @@ UNIFIED_SOURCES += [
FINAL_LIBRARY = 'xulapp_s'
LOCAL_INCLUDES += [
'..',
'../..',
]
+include('/toolkit/crashreporter/crashreporter.mozbuild')
--- a/toolkit/crashreporter/moz.build
+++ b/toolkit/crashreporter/moz.build
@@ -98,19 +98,11 @@ DEFINES['UNICODE'] = True
DEFINES['_UNICODE'] = True
JAR_MANIFESTS += ['jar.mn']
LOCAL_INCLUDES += [
'google-breakpad/src',
]
-# Suppress warnings in third-party code.
-if CONFIG['_MSC_VER']:
- CXXFLAGS += [
- '-wd4005', # macro redefinition
- ]
-elif CONFIG['GNU_CXX']:
- CXXFLAGS += [
- '-Wno-unused-local-typedefs',
- ]
+include('/toolkit/crashreporter/crashreporter.mozbuild')
FAIL_ON_WARNINGS = True
--- a/toolkit/crashreporter/test/moz.build
+++ b/toolkit/crashreporter/test/moz.build
@@ -32,8 +32,9 @@ DEFINES['SHARED_LIBRARY'] = '%s%s%s' % (
)
DEFINES['NOMINMAX'] = True
LOCAL_INCLUDES += [
'../google-breakpad/src/',
]
+include('/toolkit/crashreporter/crashreporter.mozbuild')