From f7b36d69fca6be5fd1e72a59050daf25af7e04b8 Mon Sep 17 00:00:00 2001 From: Chris AtLee Date: Mon, 24 Sep 2012 20:41:58 -0400 Subject: [PATCH] Bug 777530: remove Android.mk files from breakpad; add perl-Digest-SHA to panda build requirements. r=ted DONTBUILD --HG-- extra : rebase_source : b5c9cdf1c3ab712ad60f7114c0734d67fa5fb633 --- b2g/config/panda/config.json | 2 +- .../android/google_breakpad/Android.mk | 104 ------------------ .../android/sample_app/jni/Android.mk | 44 -------- 3 files changed, 1 insertion(+), 149 deletions(-) delete mode 100644 toolkit/crashreporter/google-breakpad/android/google_breakpad/Android.mk delete mode 100644 toolkit/crashreporter/google-breakpad/android/sample_app/jni/Android.mk diff --git a/b2g/config/panda/config.json b/b2g/config/panda/config.json index b827deb62a1..aa00046e9f4 100644 --- a/b2g/config/panda/config.json +++ b/b2g/config/panda/config.json @@ -1,5 +1,5 @@ { "tooltool_manifest": "releng-pandaboard.tt", "mock_target": "mozilla-centos6-i386", - "mock_packages": ["ccache", "make", "bison", "flex", "gcc", "g++", "mpfr", "zlib-devel", "ncurses-devel", "zip", "autoconf213", "glibc-static", "java-1.6.0-openjdk-devel"] + "mock_packages": ["ccache", "make", "bison", "flex", "gcc", "g++", "mpfr", "zlib-devel", "ncurses-devel", "zip", "autoconf213", "glibc-static", "perl-Digest-SHA"] } diff --git a/toolkit/crashreporter/google-breakpad/android/google_breakpad/Android.mk b/toolkit/crashreporter/google-breakpad/android/google_breakpad/Android.mk deleted file mode 100644 index 7bd44003916..00000000000 --- a/toolkit/crashreporter/google-breakpad/android/google_breakpad/Android.mk +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright (c) 2012, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# ndk-build module definition for the Google Breakpad client library -# -# To use this file, do the following: -# -# 1/ Include this file from your own Android.mk, either directly -# or with through the NDK's import-module function. -# -# 2/ Use the client static library in your project with: -# -# LOCAL_STATIC_LIBRARIES += breakpad_client -# -# 3/ In your source code, include "src/client/linux/exception_handler.h" -# and use the Linux instructions to use it. -# -# This module works with either the STLport or GNU libstdc++, but you need -# to select one in your Application.mk -# - -# Sanity check. We can only build for ARM for now. -ifneq (,$(filter-out armeabi armeabi-v7a x86,$(TARGET_ARCH_ABI))) -$(error Sorry, Google Breakpad only works on Android ARM and x86 for now!) -endif - -# The top Google Breakpad directory. -# We assume this Android.mk to be under 'android/google_breakpad' - -LOCAL_PATH := $(call my-dir)/../.. - -# Defube the client library module, as a simple static library that -# exports the right include path / linker flags to its users. - -include $(CLEAR_VARS) - -LOCAL_MODULE := breakpad_client - -LOCAL_CPP_EXTENSION := .cc - -# Breakpad uses inline ARM assembly that requires the library -# to be built in ARM mode. Otherwise, the build will fail with -# cryptic assembler messages like: -# Compile++ thumb : google_breakpad_client <= crash_generation_client.cc -# /tmp/cc8aMSoD.s: Assembler messages: -# /tmp/cc8aMSoD.s:132: Error: invalid immediate: 288 is out of range -# /tmp/cc8aMSoD.s:244: Error: invalid immediate: 296 is out of range -LOCAL_ARM_MODE := arm - -# List of client source files, directly taken from Makefile.am -LOCAL_SRC_FILES := \ - src/client/linux/crash_generation/crash_generation_client.cc \ - src/client/linux/handler/exception_handler.cc \ - src/client/linux/handler/minidump_descriptor.cc \ - src/client/linux/log/log.cc \ - src/client/linux/minidump_writer/linux_dumper.cc \ - src/client/linux/minidump_writer/linux_ptrace_dumper.cc \ - src/client/linux/minidump_writer/minidump_writer.cc \ - src/client/minidump_file_writer.cc \ - src/common/android/breakpad_getcontext.S \ - src/common/convert_UTF.c \ - src/common/md5.cc src/common/string_conversion.cc \ - src/common/linux/elfutils.cc \ - src/common/linux/file_id.cc \ - src/common/linux/guid_creator.cc \ - src/common/linux/linux_libc_support.cc \ - src/common/linux/memory_mapped_file.cc \ - src/common/linux/safe_readlink.cc - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/src/common/android/include \ - $(LOCAL_PATH)/src - -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES) -LOCAL_EXPORT_LDLIBS := -llog - -include $(BUILD_STATIC_LIBRARY) - -# Done. \ No newline at end of file diff --git a/toolkit/crashreporter/google-breakpad/android/sample_app/jni/Android.mk b/toolkit/crashreporter/google-breakpad/android/sample_app/jni/Android.mk deleted file mode 100644 index 61487b52c10..00000000000 --- a/toolkit/crashreporter/google-breakpad/android/sample_app/jni/Android.mk +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright (c) 2012, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE := test_google_breakpad -LOCAL_SRC_FILES := test_breakpad.cpp -LOCAL_STATIC_LIBRARIES += breakpad_client -include $(BUILD_EXECUTABLE) - -# If NDK_MODULE_PATH is defined, import the module, otherwise do a direct -# includes. This allows us to build in all scenarios easily. -ifneq ($(NDK_MODULE_PATH),) - $(call import-module,google_breakpad) -else - include $(LOCAL_PATH)/../../google_breakpad/Android.mk -endif