backout patch for bug 378463 due to bustage

toolkit/crashreporter/Makefile.in

@@ -61,12 +61,9 @@ ifeq  ($(OS_ARCH),WINNT)
 endif
 
 ifeq ($(OS_ARCH),Darwin)
-DIRS += \
-  airbag/src/common/ \
-  airbag/src/common/mac \
-  airbag/src/client/mac/handler \
-  airbag/src/tools/mac/dump_syms \
-  $(NULL)
+	DIRS += airbag/src/common/mac \
+		airbag/src/client/mac/handler \
+		$(NULL)
 endif
 
 DIRS += client

toolkit/crashreporter/google-breakpad/src/common/Makefile.in

@@ -1,65 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla Breakpad integration
-#
-# The Initial Developer of the Original Code is
-# Ted Mielczarek <ted.mielczarek@gmail.com>
-# Portions created by the Initial Developer are Copyright (C) 2007
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= breakpad_common
-LIBRARY_NAME	= breakpad_common_s
-HOST_LIBRARY_NAME = host_breakpad_common_s
-
-LOCAL_INCLUDES 	= -I$(srcdir)/..
-
-CPPSRCS	= \
-  string_conversion.cc \
-  $(NULL)
-
-CSRCS = \
-  convert_UTF.c \
-  $(NULL)
-
-HOST_CPPSRCS = $(CPPSRCS)
-
-HOST_CSRCS = $(CSRCS)
-
-# need static lib
-FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk

toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in

@@ -43,29 +43,24 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= breakpad_mac_common
 LIBRARY_NAME	= breakpad_mac_common_s
-HOST_LIBRARY_NAME = host_breakpad_mac_common_s
 
 LOCAL_INCLUDES 	= -I$(srcdir)/../..
 
-# This is a little weird, but we're building a host and a target lib here.
-# The host lib is used for dump_syms, and the target lib for the
-# crash reporter client.  Therefore, we don't need all the srcs in both.
-CPPSRCS	= \
-  file_id.cc \
-  macho_id.cc \
-  macho_walker.cc \
-  string_utilities.cc \
-  $(NULL)
+CPPSRCS		= \
+		file_id.cc \
+		macho_id.cc \
+		macho_walker.cc \
+		string_utilities.cc \
+		../string_conversion.cc \
+		$(NULL)
 
-CMSRCS = \
-  HTTPMultipartUpload.m \
-  $(NULL)
+CMSRCS		= \
+		HTTPMultipartUpload.m \
+		$(NULL)
 
-HOST_CPPSRCS = $(CPPSRCS)
+CSRCS           = \
+		../convert_UTF.c
 
-HOST_CMMSRCS = \
-  dump_syms.mm \
-  $(NULL)
 
 # need static lib
 FORCE_STATIC_LIB = 1

toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/Makefile.in

@@ -1,68 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla Breakpad integration
-#
-# The Initial Developer of the Original Code is
-# Ted Mielczarek <ted.mielczarek@gmail.com>
-# Portions created by the Initial Developer are Copyright (C) 2007
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-HOST_PROGRAM = dump_syms
-
-LOCAL_INCLUDES 	= \
-  -I$(srcdir)/../../.. \
-  -I$(srcdir)/../../../common/mac \
-  $(NULL)
-
-HOST_CMSRCS = \
-  dump_syms_tool.m \
-  $(NULL)
-
-HOST_LIBS += \
-  $(DEPTH)/toolkit/airbag/airbag/src/common/mac/$(LIB_PREFIX)host_breakpad_mac_common_s.$(LIB_SUFFIX) \
-  $(DEPTH)/toolkit/airbag/airbag/src/common/$(LIB_PREFIX)host_breakpad_common_s.$(LIB_SUFFIX) \
-  $(NULL)
-
-HOST_LDFLAGS += \
-  -framework Foundation \
-  -lcrypto \
-  $(NULL)
-
-# force C++ linking
-CPP_PROG_LINK = 1
-
-include $(topsrcdir)/config/rules.mk