Merge branch 'master' into 816

1 files changed, 0 insertions, 78 deletions

diff --git a/toolkit/crashreporter/client/moz.build b/toolkit/crashreporter/client/moz.build
deleted file mode 100644
index 456c794af..000000000
--- a/toolkit/crashreporter/client/moz.build
+++ /dev/null
@@ -1,78 +0,0 @@
-# -*- Mode: python; 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/.
-
-if CONFIG['OS_TARGET'] != 'Android':
-    Program('crashreporter')
-
-    UNIFIED_SOURCES += [
-        'crashreporter.cpp',
-    ]
-
-if CONFIG['OS_ARCH'] == 'WINNT':
-    UNIFIED_SOURCES += [
-        'crashreporter_win.cpp',
-    ]
-    DEFINES['UNICODE'] = True
-    DEFINES['_UNICODE'] = True
-    USE_LIBS += [
-        'google_breakpad_libxul_s',
-    ]
-    OS_LIBS += [
-        'comctl32',
-        'shell32',
-        'wininet',
-        'shlwapi',
-    ]
-elif CONFIG['OS_ARCH'] == 'Darwin':
-    UNIFIED_SOURCES += [
-        'crashreporter_osx.mm',
-        'crashreporter_unix_common.cpp',
-    ]
-    LOCAL_INCLUDES += [
-        '../google-breakpad/src/common/mac',
-    ]
-    OS_LIBS += ['-framework Cocoa']
-    USE_LIBS += [
-        'breakpad_common_s',
-        'breakpad_mac_common_s',
-    ]
-elif CONFIG['OS_ARCH'] == 'SunOS':
-    SOURCES += [
-        'crashreporter_linux.cpp',
-        'crashreporter_unix.cpp',
-    ]
-    USE_LIBS += [
-        'breakpad_solaris_common_s',
-    ]
-
-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
-    UNIFIED_SOURCES += [
-        'crashreporter_gtk_common.cpp',
-        'crashreporter_linux.cpp',
-        'crashreporter_unix_common.cpp'
-    ]
-    USE_LIBS += [
-        'breakpad_linux_common_s',
-    ]
-    OS_LIBS += CONFIG['TK_LIBS']
-    OS_LIBS += CONFIG['MOZ_GTHREAD_LIBS']
-    CXXFLAGS += CONFIG['TK_CFLAGS']
-    CXXFLAGS += CONFIG['MOZ_GTHREAD_CFLAGS']
-
-if CONFIG['OS_ARCH'] == 'Linux' or CONFIG['OS_ARCH'] == 'SunOS':
-    FINAL_TARGET_FILES += [
-        '/toolkit/themes/windows/global/throbber/Throbber-small.gif',
-    ]
-
-DEFINES['BIN_SUFFIX'] = '"%s"' % CONFIG['BIN_SUFFIX']
-
-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')