commit 2dd9693432b319c18a12c8a0deab5e1af5330e95
author Brian Osman <brianosman@google.com> Tue Oct 18 15:33:53 2016 -0400
committer Mike Klein <mtklein@chromium.org> Tue Oct 18 19:43:05 2016 +0000
tree b4b9693a26605dadfb38fc982ee21bcffbc7e1c0
parent f00decf64422fce118703f046b135a542c013857

GN builds viewer on Linux, too

BUG=skia:

Change-Id: Ia0c10db49905fc5a3bdf424c38576e1a6cf09ecf
Reviewed-on: https://skia-review.googlesource.com/3606
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

tools/viewer/Viewer.cpp

diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp
index 84b1eea..cd78676 100644
--- a/tools/viewer/Viewer.cpp
+++ b/tools/viewer/Viewer.cpp
@@ -14,7 +14,7 @@
 
 #include "SkATrace.h"
 #include "SkCanvas.h"
-#include "SkCommonFlags.h"
+#include "SkCommandLineFlags.h"
 #include "SkDashPathEffect.h"
 #include "SkGraphics.h"
 #include "SkMetaData.h"
@@ -49,10 +49,9 @@
     return viewer->onUIStateChanged(stateName, stateValue);
 }
 
-DEFINE_bool2(fullscreen, f, true, "Run fullscreen.");
+static DEFINE_bool2(fullscreen, f, true, "Run fullscreen.");
 
-static
-DEFINE_string2(match, m, nullptr,
+static DEFINE_string2(match, m, nullptr,
                "[~][^]substring[$] [...] of bench name to run.\n"
                "Multiple matches may be separated by spaces.\n"
                "~ causes a matching bench to always be skipped\n"
@@ -69,18 +68,16 @@
 #endif
 
 #ifdef SK_BUILD_FOR_ANDROID
-static
-DEFINE_string(skps, "/data/local/tmp/skia", "Directory to read skps from.");
-DEFINE_string(jpgs, "/data/local/tmp/skia", "Directory to read jpgs from.");
+static DEFINE_string(skps, "/data/local/tmp/skia", "Directory to read skps from.");
+static DEFINE_string(jpgs, "/data/local/tmp/skia", "Directory to read jpgs from.");
 #else
-static
-DEFINE_string(skps, "skps", "Directory to read skps from.");
-DEFINE_string(jpgs, "jpgs", "Directory to read jpgs from.");
+static DEFINE_string(skps, "skps", "Directory to read skps from.");
+static DEFINE_string(jpgs, "jpgs", "Directory to read jpgs from.");
 #endif
 
-DEFINE_string2(backend, b, "sw", "Backend to use. Allowed values are " BACKENDS_STR ".");
+static DEFINE_string2(backend, b, "sw", "Backend to use. Allowed values are " BACKENDS_STR ".");
 
-DEFINE_bool(atrace, false, "Enable support for using ATrace. ATrace is only supported on Android.");
+static DEFINE_bool(atrace, false, "Enable support for using ATrace. ATrace is only supported on Android.");
 
 const char *kBackendTypeStrings[sk_app::Window::kBackendTypeCount] = {
     " [OpenGL]",