| Index: tools/CrashHandler.cpp
 | 
| diff --git a/tools/CrashHandler.cpp b/tools/CrashHandler.cpp
 | 
| index 2ab6a9da4474080d867be4efa3ee0b72bbf2e5e9..e26772b4ba9bc3c5183c0ea43709b42fec22e201 100644
 | 
| --- a/tools/CrashHandler.cpp
 | 
| +++ b/tools/CrashHandler.cpp
 | 
| @@ -1,3 +1,10 @@
 | 
| +/*
 | 
| + * Copyright 2014 Google Inc.
 | 
| + *
 | 
| + * Use of this source code is governed by a BSD-style license that can be
 | 
| + * found in the LICENSE file.
 | 
| + */
 | 
| +
 | 
|  #include "CrashHandler.h"
 | 
|  
 | 
|  #include "SkTypes.h"
 | 
| @@ -47,7 +54,7 @@
 | 
|              _Exit(sig);
 | 
|          }
 | 
|  
 | 
| -    #elif defined(SK_BUILD_FOR_UNIX) && !defined(SK_BUILD_FOR_NACL)  // NACL doesn't have backtrace.
 | 
| +    #elif defined(SK_BUILD_FOR_UNIX)
 | 
|  
 | 
|          // We'd use libunwind here too, but it's a pain to get installed for
 | 
|          // both 32 and 64 bit on bots.  Doesn't matter much: catchsegv is best anyway.
 | 
| @@ -67,7 +74,7 @@
 | 
|  
 | 
|      #endif
 | 
|  
 | 
| -    #if (defined(SK_BUILD_FOR_MAC) || (defined(SK_BUILD_FOR_UNIX) && !defined(SK_BUILD_FOR_NACL)))
 | 
| +    #if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_UNIX)
 | 
|          #include <signal.h>
 | 
|  
 | 
|          void SetupCrashHandler() {
 | 
| 
 |