Convert external/google_breakpad to Android.bp am: bf7382d1bc am: ae5be23723

am: 5b31887044

Change-Id: I743e281915ce50b79e3207122a80b147d95282aa

2 files changed, 257 insertions, 216 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 00000000..a037d527
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,255 @@
+// Copyright (C) 2015 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Static library.
+// =================================================
+cc_library_static {
+    name: "breakpad_client",
+
+    srcs: [
+        "src/client/linux/dump_writer_common/seccomp_unwinder.cc",
+        "src/client/linux/dump_writer_common/thread_info.cc",
+        "src/client/linux/dump_writer_common/ucontext_reader.cc",
+        "src/client/linux/handler/minidump_descriptor.cc",
+        "src/client/linux/minidump_writer/linux_core_dumper.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/convert_UTF.c",
+        "src/common/linux/elf_core_dump.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",
+        "src/common/string_conversion.cc",
+    ],
+
+    export_include_dirs: [
+        "src/common/android/include",
+        "src",
+    ],
+
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wno-unused-parameter",
+        "-Wno-tautological-compare",
+    ],
+
+    // Work around b/25435766 core2md segfault.
+    arch: {
+        x86: {
+            clang_cflags: ["-mno-stackrealign"],
+        },
+    },
+}
+
+// core2md binary.
+// =================================================
+cc_binary {
+    name: "core2md",
+
+    srcs: ["src/tools/linux/core2md/core2md.cc"],
+
+    static_libs: ["breakpad_client"],
+
+    // Work around b/25435766 core2md segfault.
+    arch: {
+        x86: {
+            clang_cflags: ["-mno-stackrealign"],
+        },
+    },
+
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
+}
+
+// dump_syms host tool.
+// =================================================
+cc_binary_host {
+    name: "dump_syms",
+    target: {
+        darwin: {
+            enabled: false,
+        },
+
+        linux_glibc: {
+            cppflags: [
+                "-DHAVE_A_OUT_H",
+                "-Wno-unused-parameter",
+            ],
+
+            srcs: [
+                "src/common/linux/crc32.cc",
+                "src/common/linux/dump_symbols.cc",
+                "src/common/linux/elfutils.cc",
+                "src/common/linux/elf_symbols_to_module.cc",
+                "src/common/linux/file_id.cc",
+                "src/common/linux/linux_libc_support.cc",
+                "src/common/linux/memory_mapped_file.cc",
+                "src/tools/linux/dump_syms/dump_syms.cc",
+            ],
+        },
+    },
+
+    local_include_dirs: ["src"],
+    srcs: [
+        "src/common/dwarf/bytereader.cc",
+        "src/common/dwarf/dwarf2diehandler.cc",
+        "src/common/dwarf/dwarf2reader.cc",
+        "src/common/dwarf_cfi_to_module.cc",
+        "src/common/dwarf_cu_to_module.cc",
+        "src/common/dwarf_line_to_module.cc",
+        "src/common/language.cc",
+        "src/common/module.cc",
+        "src/common/stabs_reader.cc",
+        "src/common/stabs_to_module.cc",
+    ],
+
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wno-unused-local-typedef",
+        "-Wno-unused-private-field",
+        "-Wno-unused-result",
+    ],
+}
+
+// sym_upload host tool.
+// =================================================
+cc_binary_host {
+    name: "sym_upload",
+    target: {
+        darwin: {
+            enabled: false,
+        },
+
+        linux_glibc: {
+            srcs: [
+                "src/common/linux/http_upload.cc",
+                "src/tools/linux/symupload/sym_upload.cc",
+            ],
+        },
+    },
+
+    local_include_dirs: ["src"],
+
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wno-unused-parameter",
+    ],
+}
+
+// libdisasm static library.
+// =================================================
+cc_library_host_static {
+    name: "libdisasm",
+    target: {
+        darwin: {
+            enabled: false,
+        },
+
+        linux_glibc: {
+            cflags: [
+                "-Wno-missing-field-initializers",
+                "-Wno-pointer-arith",
+                "-Wno-tautological-constant-out-of-range-compare",
+                "-Wno-unused-parameter",
+            ],
+        },
+    },
+
+    export_include_dirs: ["src/third_party/libdisasm"],
+    srcs: [
+        "src/third_party/libdisasm/ia32_implicit.c",
+        "src/third_party/libdisasm/ia32_insn.c",
+        "src/third_party/libdisasm/ia32_invariant.c",
+        "src/third_party/libdisasm/ia32_modrm.c",
+        "src/third_party/libdisasm/ia32_opcode_tables.c",
+        "src/third_party/libdisasm/ia32_operand.c",
+        "src/third_party/libdisasm/ia32_reg.c",
+        "src/third_party/libdisasm/ia32_settings.c",
+        "src/third_party/libdisasm/x86_disasm.c",
+        "src/third_party/libdisasm/x86_format.c",
+        "src/third_party/libdisasm/x86_imm.c",
+        "src/third_party/libdisasm/x86_insn.c",
+        "src/third_party/libdisasm/x86_misc.c",
+        "src/third_party/libdisasm/x86_operand_list.c",
+    ],
+}
+
+// minidump_stackwalk host tool.
+// =================================================
+cc_binary_host {
+    name: "minidump_stackwalk",
+    target: {
+        darwin: {
+            enabled: false,
+        },
+
+        linux_glibc: {
+            cppflags: [
+                "-DHAVE_A_OUT_H",
+                "-Wno-unused-function",
+                "-Wno-unused-parameter",
+            ],
+
+            srcs: [
+                "src/processor/basic_code_modules.cc",
+                "src/processor/basic_source_line_resolver.cc",
+                "src/processor/call_stack.cc",
+                "src/processor/cfi_frame_info.cc",
+                "src/processor/disassembler_x86.cc",
+                "src/processor/dump_context.cc",
+                "src/processor/dump_object.cc",
+                "src/processor/exploitability.cc",
+                "src/processor/exploitability_linux.cc",
+                "src/processor/exploitability_win.cc",
+                "src/processor/logging.cc",
+                "src/processor/microdump.cc",
+                "src/processor/microdump_processor.cc",
+                "src/processor/minidump.cc",
+                "src/processor/minidump_processor.cc",
+                "src/processor/minidump_stackwalk.cc",
+                "src/processor/pathname_stripper.cc",
+                "src/processor/process_state.cc",
+                "src/processor/simple_symbol_supplier.cc",
+                "src/processor/source_line_resolver_base.cc",
+                "src/processor/stack_frame_symbolizer.cc",
+                "src/processor/stackwalk_common.cc",
+                "src/processor/stackwalker.cc",
+                "src/processor/stackwalker_amd64.cc",
+                "src/processor/stackwalker_arm.cc",
+                "src/processor/stackwalker_arm64.cc",
+                "src/processor/stackwalker_mips.cc",
+                "src/processor/stackwalker_ppc.cc",
+                "src/processor/stackwalker_ppc64.cc",
+                "src/processor/stackwalker_sparc.cc",
+                "src/processor/stackwalker_x86.cc",
+                "src/processor/symbolic_constants_win.cc",
+                "src/processor/tokenize.cc",
+            ],
+        },
+    },
+
+    local_include_dirs: ["src"],
+
+    static_libs: ["libdisasm"],
+}
diff --git a/Android.mk b/Android.mk
index 79f36d87..de0f7e77 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,216 +1,2 @@
-# Copyright (C) 2015 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(call my-dir)
-
-# Static library.
-# =================================================
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := breakpad_client
-
-LOCAL_CPP_EXTENSION := .cc
-
-LOCAL_SRC_FILES := \
-    src/client/linux/dump_writer_common/seccomp_unwinder.cc \
-    src/client/linux/dump_writer_common/thread_info.cc \
-    src/client/linux/dump_writer_common/ucontext_reader.cc \
-    src/client/linux/handler/minidump_descriptor.cc \
-    src/client/linux/minidump_writer/linux_core_dumper.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/convert_UTF.c \
-    src/common/linux/elf_core_dump.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 \
-    src/common/string_conversion.cc \
-
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/src/common/android/include \
-    $(LOCAL_PATH)/src \
-
-LOCAL_CFLAGS := \
-    -Wall -Werror \
-    -Wno-unused-parameter \
-    -Wno-tautological-compare
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_C_INCLUDES)
-
-# Work around b/25435766 core2md segfault.
-LOCAL_CLANG_CFLAGS_x86 += -mno-stackrealign
-LOCAL_CLANG := true
-
-include $(BUILD_STATIC_LIBRARY)
-
-# core2md binary.
-# =================================================
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := core2md
-
-LOCAL_CPP_EXTENSION := .cc
-
-LOCAL_SRC_FILES := src/tools/linux/core2md/core2md.cc
-
-LOCAL_STATIC_LIBRARIES := breakpad_client
-
-# Work around b/25435766 core2md segfault.
-LOCAL_CLANG_CFLAGS_x86 += -mno-stackrealign
-LOCAL_CLANG := true
-
-LOCAL_CFLAGS := -Wall -Werror
-
-include $(BUILD_EXECUTABLE)
-
-# dump_syms host tool.
-# =================================================
-include $(CLEAR_VARS)
-LOCAL_MODULE := dump_syms
-LOCAL_MODULE_HOST_OS := linux
-LOCAL_CLANG := true
-LOCAL_CPPFLAGS_linux := -DHAVE_A_OUT_H -Wno-unused-parameter
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/src
-LOCAL_SRC_FILES := \
-    src/common/dwarf/bytereader.cc \
-    src/common/dwarf/dwarf2diehandler.cc \
-    src/common/dwarf/dwarf2reader.cc \
-    src/common/dwarf_cfi_to_module.cc \
-    src/common/dwarf_cu_to_module.cc \
-    src/common/dwarf_line_to_module.cc \
-    src/common/language.cc \
-    src/common/module.cc \
-    src/common/stabs_reader.cc \
-    src/common/stabs_to_module.cc
-LOCAL_SRC_FILES_linux := \
-    src/common/linux/crc32.cc \
-    src/common/linux/dump_symbols.cc \
-    src/common/linux/elfutils.cc \
-    src/common/linux/elf_symbols_to_module.cc \
-    src/common/linux/file_id.cc \
-    src/common/linux/linux_libc_support.cc \
-    src/common/linux/memory_mapped_file.cc \
-    src/tools/linux/dump_syms/dump_syms.cc
-LOCAL_CFLAGS := \
-    -Wall -Werror \
-    -Wno-unused-local-typedef \
-    -Wno-unused-private-field \
-    -Wno-unused-result \
-
-include $(BUILD_HOST_EXECUTABLE)
-
-# sym_upload host tool.
-# =================================================
-include $(CLEAR_VARS)
-LOCAL_MODULE := sym_upload
-LOCAL_MODULE_HOST_OS := linux
-LOCAL_CLANG := true
-LOCAL_LDLIBS := -ldl
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/src
-LOCAL_SRC_FILES_linux := \
-    src/common/linux/http_upload.cc \
-    src/tools/linux/symupload/sym_upload.cc
-LOCAL_CFLAGS := -Wall -Werror -Wno-unused-parameter
-include $(BUILD_HOST_EXECUTABLE)
-
-# libdisasm static library.
-# =================================================
-include $(CLEAR_VARS)
-LOCAL_MODULE := libdisasm
-LOCAL_MODULE_HOST_OS := linux
-LOCAL_CLANG := true
-LOCAL_CFLAGS_linux := \
-    -Wno-missing-field-initializers \
-    -Wno-pointer-arith \
-    -Wno-tautological-constant-out-of-range-compare \
-    -Wno-unused-parameter
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/src/third_party/libdisasm
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-    $(LOCAL_PATH)/src/third_party/libdisasm
-LOCAL_SRC_FILES := \
-    src/third_party/libdisasm/ia32_implicit.c \
-    src/third_party/libdisasm/ia32_insn.c \
-    src/third_party/libdisasm/ia32_invariant.c \
-    src/third_party/libdisasm/ia32_modrm.c \
-    src/third_party/libdisasm/ia32_opcode_tables.c \
-    src/third_party/libdisasm/ia32_operand.c \
-    src/third_party/libdisasm/ia32_reg.c \
-    src/third_party/libdisasm/ia32_settings.c \
-    src/third_party/libdisasm/x86_disasm.c \
-    src/third_party/libdisasm/x86_format.c \
-    src/third_party/libdisasm/x86_imm.c \
-    src/third_party/libdisasm/x86_insn.c \
-    src/third_party/libdisasm/x86_misc.c \
-    src/third_party/libdisasm/x86_operand_list.c
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-# minidump_stackwalk host tool.
-# =================================================
-include $(CLEAR_VARS)
-LOCAL_MODULE := minidump_stackwalk
-LOCAL_MODULE_HOST_OS := linux
-LOCAL_CLANG := true
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_CPPFLAGS_linux := \
-    -DHAVE_A_OUT_H \
-    -Wno-unused-function \
-    -Wno-unused-parameter
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/src
-LOCAL_SRC_FILES_linux := \
-    src/processor/basic_code_modules.cc \
-    src/processor/basic_source_line_resolver.cc \
-    src/processor/call_stack.cc \
-    src/processor/cfi_frame_info.cc \
-    src/processor/disassembler_x86.cc \
-    src/processor/dump_context.cc \
-    src/processor/dump_object.cc \
-    src/processor/exploitability.cc \
-    src/processor/exploitability_linux.cc \
-    src/processor/exploitability_win.cc \
-    src/processor/logging.cc \
-    src/processor/microdump.cc \
-    src/processor/microdump_processor.cc \
-    src/processor/minidump.cc \
-    src/processor/minidump_processor.cc \
-    src/processor/minidump_stackwalk.cc \
-    src/processor/pathname_stripper.cc \
-    src/processor/process_state.cc \
-    src/processor/simple_symbol_supplier.cc \
-    src/processor/source_line_resolver_base.cc \
-    src/processor/stack_frame_symbolizer.cc \
-    src/processor/stackwalk_common.cc \
-    src/processor/stackwalker.cc \
-    src/processor/stackwalker_amd64.cc \
-    src/processor/stackwalker_arm.cc \
-    src/processor/stackwalker_arm64.cc \
-    src/processor/stackwalker_mips.cc \
-    src/processor/stackwalker_ppc.cc \
-    src/processor/stackwalker_ppc64.cc \
-    src/processor/stackwalker_sparc.cc \
-    src/processor/stackwalker_x86.cc \
-    src/processor/symbolic_constants_win.cc \
-    src/processor/tokenize.cc
-LOCAL_STATIC_LIBRARIES := libdisasm
-include $(BUILD_HOST_EXECUTABLE)
+# Empty Android.mk to prevent recursing into subdirectories containing
+# NDK Android.mk files.