aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar fmalita <fmalita@chromium.org>2016-09-14 09:05:43 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-09-14 09:05:43 -0700
commit95573e4865c913a01571b17fb88c0450b1aa3ca7 (patch)
treed543c98a2f129d8b94f7df110b9d12b2c3c65272
parent6519c21a57946366c1141fa81fe1b283150b43fc (diff)
Fix SVG flag iOS linking
-rw-r--r--bench/nanobench.cpp2
-rw-r--r--dm/DM.cpp2
-rw-r--r--tools/flags/SkCommonFlags.cpp2
-rw-r--r--tools/flags/SkCommonFlags.h1
4 files changed, 3 insertions, 4 deletions
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index 26ba05ff4f..ef22deeb42 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -127,8 +127,6 @@ DEFINE_string(sourceType, "",
DEFINE_string(benchType, "",
"Apply usual --match rules to bench type: micro, recording, playback, skcodec, etc.");
-DEFINE_string(svgs, "", "Directory to read SVGs from, or a single SVG file.");
-
static double now_ms() { return SkTime::GetNSecs() * 1e-6; }
static SkString humanize(double ms) {
diff --git a/dm/DM.cpp b/dm/DM.cpp
index fc332a2ade..53709ba76d 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -73,8 +73,6 @@ DEFINE_int32(shard, 0, "Which shard do I run?");
DEFINE_string(mskps, "", "Directory to read mskps from, or a single mskp file.");
-DEFINE_string(svgs, "", "Directory to read SVGs from, or a single SVG file.");
-
using namespace DM;
using sk_gpu_test::GrContextFactory;
using sk_gpu_test::GLTestContext;
diff --git a/tools/flags/SkCommonFlags.cpp b/tools/flags/SkCommonFlags.cpp
index 57078fa426..bf2bde0426 100644
--- a/tools/flags/SkCommonFlags.cpp
+++ b/tools/flags/SkCommonFlags.cpp
@@ -48,6 +48,8 @@ DEFINE_bool(releaseAndAbandonGpuContext, false,
DEFINE_string(skps, "skps", "Directory to read skps from.");
+DEFINE_string(svgs, "", "Directory to read SVGs from, or a single SVG file.");
+
DEFINE_int32(threads, -1, "Run threadsafe tests on a threadpool with this many extra threads, "
"defaulting to one extra thread per core.");
diff --git a/tools/flags/SkCommonFlags.h b/tools/flags/SkCommonFlags.h
index 9b694882af..050303b8e1 100644
--- a/tools/flags/SkCommonFlags.h
+++ b/tools/flags/SkCommonFlags.h
@@ -25,6 +25,7 @@ DECLARE_bool(preAbandonGpuContext);
DECLARE_bool(abandonGpuContext);
DECLARE_bool(releaseAndAbandonGpuContext);
DECLARE_string(skps);
+DECLARE_string(svgs);
DECLARE_int32(threads);
DECLARE_string(resourcePath);
DECLARE_bool(verbose);