Merge remote-tracking branch 'aosp/upstream-master' into merge-from-upstream-20190420

* Fixed build for host
* Added required METADATA and MODULE_LICENSE_BSD files

Bug: 154443614
Test: mm -j40
Change-Id: I5f9bb7b9ac14170b7e44e3b3dcfb4c37619fbd15

1 files changed, 30 insertions, 27 deletions

diff --git a/Android.bp b/Android.bp
index 074fdaf5..d76c9e22 100644
--- a/Android.bp
+++ b/Android.bp
@@ -16,18 +16,22 @@
 // =================================================
 cc_library_static {
     name: "breakpad_client",
-
+    host_supported: true,
     srcs: [
-        "src/client/linux/dump_writer_common/seccomp_unwinder.cc",
+        "src/client/linux/crash_generation/crash_generation_client.cc",
         "src/client/linux/dump_writer_common/thread_info.cc",
         "src/client/linux/dump_writer_common/ucontext_reader.cc",
+        "src/client/linux/handler/exception_handler.cc",
         "src/client/linux/handler/minidump_descriptor.cc",
+        "src/client/linux/log/log.cc",
+        "src/client/linux/microdump_writer/microdump_writer.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/convert_UTF.cc",
+        "src/common/linux/breakpad_getcontext.S",
         "src/common/linux/elf_core_dump.cc",
         "src/common/linux/elfutils.cc",
         "src/common/linux/file_id.cc",
@@ -37,19 +41,20 @@ cc_library_static {
         "src/common/linux/safe_readlink.cc",
         "src/common/string_conversion.cc",
     ],
-
-    export_include_dirs: [
-        "src/common/android/include",
-        "src",
-    ],
-
+    export_include_dirs: ["src"],
     cflags: [
         "-Wall",
         "-Werror",
         "-Wno-unused-parameter",
         "-Wno-tautological-compare",
     ],
-
+    target: {
+        android: {
+            local_include_dirs: [
+                "src/common/android/include",
+            ],
+        },
+    },
     // Work around b/25435766 core2md segfault.
     arch: {
         x86: {
@@ -62,18 +67,19 @@ cc_library_static {
 // =================================================
 cc_binary {
     name: "core2md",
-
-    srcs: ["src/tools/linux/core2md/core2md.cc"],
-
+    host_supported: true,
+    srcs: [
+        "src/common/convert_UTF.cc",
+        "src/common/path_helper.cc",
+        "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",
@@ -88,14 +94,14 @@ cc_binary_host {
         darwin: {
             enabled: false,
         },
-
         linux_glibc: {
             cppflags: [
                 "-DHAVE_A_OUT_H",
                 "-Wno-unused-parameter",
             ],
-
             srcs: [
+                "src/common/dwarf/elf_reader.cc",
+                "src/common/dwarf_range_list_handler.cc",
                 "src/common/linux/crc32.cc",
                 "src/common/linux/dump_symbols.cc",
                 "src/common/linux/elfutils.cc",
@@ -103,11 +109,11 @@ cc_binary_host {
                 "src/common/linux/file_id.cc",
                 "src/common/linux/linux_libc_support.cc",
                 "src/common/linux/memory_mapped_file.cc",
+                "src/common/path_helper.cc",
                 "src/tools/linux/dump_syms/dump_syms.cc",
             ],
         },
     },
-
     local_include_dirs: ["src"],
     srcs: [
         "src/common/dwarf/bytereader.cc",
@@ -139,17 +145,17 @@ cc_binary_host {
         darwin: {
             enabled: false,
         },
-
         linux_glibc: {
             srcs: [
                 "src/common/linux/http_upload.cc",
+                "src/common/linux/libcurl_wrapper.cc",
+                "src/common/linux/symbol_collector_client.cc",
+                "src/common/linux/symbol_upload.cc",
                 "src/tools/linux/symupload/sym_upload.cc",
             ],
         },
     },
-
     local_include_dirs: ["src"],
-
     cflags: [
         "-Wall",
         "-Werror",
@@ -165,7 +171,6 @@ cc_library_host_static {
         darwin: {
             enabled: false,
         },
-
         linux_glibc: {
             cflags: [
                 "-Wno-missing-field-initializers",
@@ -175,7 +180,6 @@ cc_library_host_static {
             ],
         },
     },
-
     export_include_dirs: ["src/third_party/libdisasm"],
     srcs: [
         "src/third_party/libdisasm/ia32_implicit.c",
@@ -203,7 +207,6 @@ cc_binary_host {
         darwin: {
             enabled: false,
         },
-
         linux_glibc: {
             cppflags: [
                 "-DHAVE_A_OUT_H",
@@ -212,12 +215,13 @@ cc_binary_host {
                 "-Wno-unused-function",
                 "-Wno-unused-parameter",
             ],
-
             srcs: [
+                "src/common/path_helper.cc",
                 "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/convert_old_arm64_context.cc",
                 "src/processor/disassembler_x86.cc",
                 "src/processor/dump_context.cc",
                 "src/processor/dump_object.cc",
@@ -232,6 +236,7 @@ cc_binary_host {
                 "src/processor/minidump_stackwalk.cc",
                 "src/processor/pathname_stripper.cc",
                 "src/processor/process_state.cc",
+                "src/processor/proc_maps_linux.cc",
                 "src/processor/simple_symbol_supplier.cc",
                 "src/processor/source_line_resolver_base.cc",
                 "src/processor/stack_frame_symbolizer.cc",
@@ -250,8 +255,6 @@ cc_binary_host {
             ],
         },
     },
-
     local_include_dirs: ["src"],
-
     static_libs: ["libdisasm"],
 }