[NaCl SDK] Add minidump_generator library/headers.

Also add tools/dump_syms

BUG=242561
R=noelallen@chromium.org

Review URL: https://codereview.chromium.org/15596002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202178 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 126 insertions, 8 deletions

diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index 1db44a0..1577d1c 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -247,24 +247,26 @@ def BuildStepUntarToolchains(pepperdir, platform, arch, toolchains):
 NACL_HEADER_MAP = {
   'newlib': [
       ('src/include/nacl/nacl_exception.h', 'nacl/'),
+      ('src/include/nacl/nacl_minidump.h', 'nacl/'),
+      ('src/untrusted/irt/irt.h', ''),
+      ('src/untrusted/irt/irt_ppapi.h', ''),
       ('src/untrusted/nacl/nacl_dyncode.h', 'nacl/'),
       ('src/untrusted/nacl/nacl_startup.h', 'nacl/'),
       ('src/untrusted/nacl/nacl_thread.h', 'nacl/'),
       ('src/untrusted/nacl/pnacl.h', ''),
-      ('src/untrusted/irt/irt.h', ''),
-      ('src/untrusted/irt/irt_ppapi.h', ''),
       ('src/untrusted/pthread/pthread.h', ''),
       ('src/untrusted/pthread/semaphore.h', ''),
       ('src/untrusted/valgrind/dynamic_annotations.h', 'nacl/'),
   ],
   'glibc': [
       ('src/include/nacl/nacl_exception.h', 'nacl/'),
+      ('src/include/nacl/nacl_minidump.h', 'nacl/'),
+      ('src/untrusted/irt/irt.h', ''),
+      ('src/untrusted/irt/irt_ppapi.h', ''),
       ('src/untrusted/nacl/nacl_dyncode.h', 'nacl/'),
       ('src/untrusted/nacl/nacl_startup.h', 'nacl/'),
       ('src/untrusted/nacl/nacl_thread.h', 'nacl/'),
       ('src/untrusted/nacl/pnacl.h', ''),
-      ('src/untrusted/irt/irt.h', ''),
-      ('src/untrusted/irt/irt_ppapi.h', ''),
       ('src/untrusted/valgrind/dynamic_annotations.h', 'nacl/'),
   ],
   'host': []
@@ -404,18 +406,24 @@ TOOLCHAIN_LIBS = {
   'newlib' : [
     'crti.o',
     'crtn.o',
+    'libminidump_generator.a',
     'libnacl.a',
     'libnacl_dyncode.a',
+    'libnacl_exception.a',
     'libnacl_list_mappings.a',
+    'libnosys.a',
     'libppapi.a',
     'libppapi_stub.a',
-    'libnosys.a',
     'libpthread.a',
   ],
   'glibc': [
+    'libminidump_generator.a',
+    'libminidump_generator.so',
     'libnacl.a',
     'libnacl_dyncode.a',
     'libnacl_dyncode.so',
+    'libnacl_exception.a',
+    'libnacl_exception.so',
     'libnacl_list_mappings.a',
     'libnacl_list_mappings.so',
     'libppapi.a',
@@ -429,6 +437,7 @@ def GypNinjaInstall(pepperdir, platform, toolchains):
   build_dir = 'gypbuild'
   ninja_out_dir = os.path.join(OUT_DIR, build_dir, 'Release')
   tools_files = [
+    ['dump_syms', 'dump_syms'],
     ['sel_ldr', 'sel_ldr_x86_32'],
     ['ncval_x86_32', 'ncval_x86_32'],
     ['ncval_arm', 'ncval_arm'],
@@ -518,7 +527,14 @@ def GypNinjaBuild_NaCl(platform, rel_out_dir):
           os.path.join(SRC_DIR, out_dir, 'Release', dst))
 
 
-def GypNinjaBuild_Chrome(arch, rel_out_dir):
+def GypNinjaBuild_Breakpad(platform, rel_out_dir):
+  gyp_py = os.path.join(SRC_DIR, 'build', 'gyp_chromium')
+  out_dir = MakeNinjaRelPath(rel_out_dir)
+  gyp_file = os.path.join(SRC_DIR, 'breakpad', 'breakpad.gyp')
+  GypNinjaBuild('ia32', gyp_py, gyp_file, 'dump_syms', out_dir)
+
+
+def GypNinjaBuild_PPAPI(arch, rel_out_dir):
   gyp_py = os.path.join(SRC_DIR, 'build', 'gyp_chromium')
   out_dir = MakeNinjaRelPath(rel_out_dir)
   gyp_file = os.path.join(SRC_DIR, 'ppapi', 'native_client',
@@ -578,6 +594,7 @@ def BuildStepBuildToolchains(pepperdir, platform, toolchains):
   buildbot_common.BuildStep('SDK Items')
 
   GypNinjaBuild_NaCl(platform, 'gypbuild')
+  GypNinjaBuild_Breakpad(platform, 'gypbuild')
 
   tcname = platform + '_x86'
   newlibdir = os.path.join(pepperdir, 'toolchain', tcname + '_newlib')
@@ -585,10 +602,10 @@ def BuildStepBuildToolchains(pepperdir, platform, toolchains):
   pnacldir = os.path.join(pepperdir, 'toolchain', tcname + '_pnacl')
 
   if set(toolchains) & set(['glibc', 'newlib']):
-    GypNinjaBuild_Chrome('ia32', 'gypbuild')
+    GypNinjaBuild_PPAPI('ia32', 'gypbuild')
 
   if 'arm' in toolchains:
-    GypNinjaBuild_Chrome('arm', 'gypbuild-arm')
+    GypNinjaBuild_PPAPI('arm', 'gypbuild-arm')
 
   GypNinjaInstall(pepperdir, platform, toolchains)
 
diff --git a/native_client_sdk/src/build_tools/sdk_files.list b/native_client_sdk/src/build_tools/sdk_files.list
index 4ec57ae..b114426 100644
--- a/native_client_sdk/src/build_tools/sdk_files.list
+++ b/native_client_sdk/src/build_tools/sdk_files.list
@@ -836,14 +836,115 @@ src/ppapi_cpp_private/x509_certificate_private.cc
 [win]src/ppapi/make.bat
 [win,linux]src/ppapi/Makefile
 [win,linux]src/ppapi/ppapi_externs.c
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/include/irt.h
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/include/irt_ppapi.h
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/include/nacl/dynamic_annotations.h
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/include/nacl/nacl_dyncode.h
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/include/nacl/nacl_exception.h
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/include/nacl/nacl_minidump.h
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/include/nacl/nacl_startup.h
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/include/nacl/nacl_thread.h
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/include/pnacl.h
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/include/pthread.h
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/include/semaphore.h
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/lib/crti.o
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/lib/crtn.o
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/lib/libminidump_generator.a
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/lib/libnacl.a
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/lib/libnacl_dyncode.a
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/lib/libnacl_exception.a
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/lib/libnacl_list_mappings.a
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/lib/libnosys.a
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/lib/libppapi.a
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/lib/libppapi_stub.a
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/lib/libpthread.a
 toolchain/${PLATFORM}_arm_newlib/*
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/include/irt.h
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/include/irt_ppapi.h
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/include/nacl/dynamic_annotations.h
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/include/nacl/nacl_dyncode.h
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/include/nacl/nacl_exception.h
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/include/nacl/nacl_minidump.h
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/include/nacl/nacl_startup.h
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/include/nacl/nacl_thread.h
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/include/pnacl.h
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libminidump_generator.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libminidump_generator.so
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libnacl.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libnacl_dyncode.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libnacl_dyncode.so
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libnacl_exception.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libnacl_exception.so
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libnacl_list_mappings.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libnacl_list_mappings.so
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libppapi.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libppapi.so
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libppapi_stub.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libminidump_generator.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libminidump_generator.so
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libnacl.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libnacl_dyncode.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libnacl_dyncode.so
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libnacl_exception.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libnacl_exception.so
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libnacl_list_mappings.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libnacl_list_mappings.so
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libppapi.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libppapi.so
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libppapi_stub.a
 toolchain/${PLATFORM}_x86_glibc/*
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/include/irt.h
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/include/irt_ppapi.h
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/include/nacl/dynamic_annotations.h
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/include/nacl/nacl_dyncode.h
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/include/nacl/nacl_exception.h
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/include/nacl/nacl_minidump.h
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/include/nacl/nacl_startup.h
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/include/nacl/nacl_thread.h
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/include/pnacl.h
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/include/pthread.h
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/include/semaphore.h
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/crti.o
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/crtn.o
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libminidump_generator.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libnacl.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libnacl_dyncode.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libnacl_exception.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libnacl_list_mappings.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libnosys.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libppapi.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libppapi_stub.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libpthread.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib/crti.o
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib/crtn.o
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib/libminidump_generator.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib/libnacl.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib/libnacl_dyncode.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib/libnacl_exception.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib/libnacl_list_mappings.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib/libnosys.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib/libppapi.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib/libppapi_stub.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib/libpthread.a
 toolchain/${PLATFORM}_x86_newlib/*
+toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/include/irt.h
+toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/include/irt_ppapi.h
+toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/include/nacl/dynamic_annotations.h
+toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/include/nacl/nacl_dyncode.h
+toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/include/nacl/nacl_exception.h
+toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/include/nacl/nacl_minidump.h
+toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/include/nacl/nacl_startup.h
+toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/include/nacl/nacl_thread.h
+toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/include/pnacl.h
+toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/include/pthread.h
+toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/include/semaphore.h
 toolchain/${PLATFORM}_x86_pnacl/*
 tools/common.mk
 tools/compiler-wrapper.py
 tools/create_nmf.py
 tools/decode_dump.py
+[linux,mac]tools/dump_syms
+[win]tools/dump_syms.exe
 tools/genhttpfs.py
 tools/getos.py
 tools/host_gcc.mk