Make crash dump tests runnable

Like upstream, you must pass a breakpad_tools_dir argument for the tests
to run. Unlike upstream, the Breakpad #includes will be looked for also
in the tools dir, instead of the Chromium code depot.

Author: slipher

README.md

@@ -29,6 +29,10 @@ scons --mode=nacl saigo=1 platform=x86-64 irt_core_raw [optional saigo_newlib_di
 This builds both components and runs some tests.
 ```
 scons --mode=opt-host,nacl saigo=1 platform=x86-64 --keep-going small_tests medium_tests
+
+To enable crash dump tests, add the option `breakpad_tools_dir=<path to breakpad>`. The
+repository can be found at `daemon/libs/breakpad`. You need to have built the Breakpad
+tools in-source.
 ```
 ---
 

src/untrusted/minidump_generator/minidump_generator.cc

@@ -25,7 +25,7 @@
 
 #include <algorithm>
 
-#include "breakpad/src/google_breakpad/common/minidump_format.h"
+#include "google_breakpad/common/minidump_format.h"
 #if !DYNAMIC_LOADING_SUPPORT
 # include "native_client/src/include/elf_constants.h"
 #endif

src/untrusted/minidump_generator/nacl.scons

@@ -5,8 +5,9 @@
 
 Import('env')
 
+# DAEMON: use the same dir as Breakpad tools for Breakpad includes
 # Allow Breakpad headers to #include other Breakpad headers.
-env.Append(CPPPATH=['${SOURCE_ROOT}/breakpad/src'])
+env.Append(CPPPATH=['${BREAKPAD_TOOLS_DIR}/src'])
 # Breakpad's headers do not compile with "-pedantic".
 env.FilterOut(CCFLAGS=['-pedantic'])
 

tests/untrusted_minidump/nacl.scons

@@ -10,6 +10,9 @@ Import('env')
 if not env.SetNonStableBitcodeIfAllowed():
   Return()
 
+if env.get('BREAKPAD_TOOLS_DIR') is None:
+  Return() # DAEMON: avoid building minidump_generator
+
 if env.Bit('bitcode'):
   # With the PNaCl toolchain, special flags are required to get a build ID.
   env.Append(LINKFLAGS=['--pnacl-allow-nexe-build-id'])