diff options
| author |  borenet <borenet@google.com> | 2015-04-02 12:16:36 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-04-02 12:16:36 -0700 |
| commit | 4808757d7a8bbe8c773a312a894738e9ff701b5f (patch) | |
| tree | 62eb6866702dbd1df89964c7659e39bda2bfdea3 /tools | |
| parent | 07342361a3cda94376230b37d9e863052449653c (diff) | |
Remove all code related to NaCl
BUG=skia:3600
DOCS_PREVIEW= https://skia.org/?cl=1036283002
Review URL: https://codereview.chromium.org/1036283002
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/CrashHandler.cpp | 11 | ||||
| -rw-r--r-- | tools/skpdiff/skpdiff_main.cpp | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/tools/CrashHandler.cpp b/tools/CrashHandler.cpp index 2ab6a9da44..e26772b4ba 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() { diff --git a/tools/skpdiff/skpdiff_main.cpp b/tools/skpdiff/skpdiff_main.cpp index 92f1307eca..b5ba31072d 100644 --- a/tools/skpdiff/skpdiff_main.cpp +++ b/tools/skpdiff/skpdiff_main.cpp @@ -10,6 +10,8 @@ // the execution of an arbitrary set of difference algorithms. // See http://skbug.com/2711 ('rename skpdiff') +#include "SkTypes.h" + #if SK_SUPPORT_OPENCL #define __NO_STD_VECTOR // Uses cl::vectpr instead of std::vectpr @@ -259,7 +261,7 @@ int tool_main(int argc, char * argv[]) { return 0; } -#if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) +#if !defined(SK_BUILD_FOR_IOS) int main(int argc, char * argv[]) { return tool_main(argc, (char**) argv); } |