diff options
| author |  scroggo <scroggo@google.com> | 2014-06-18 10:31:40 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-18 10:31:40 -0700 |
| commit | f01a6c3663970ccd6e1882e76a887e0fda467b77 (patch) | |
| tree | 849e0d79d4188528cf17849bb9535a452c05dfde /tools | |
| parent | b59161f0000eb4aca3dcef29f27ffd0fb5a568e5 (diff) | |
In Android framework, make tools depend on jsoncpp
Always build the tools with JSON, but either build our own
or use the system's.
Rename skia_build_json_writer to skia_use_system_jsoncpp,
since we now always build with JSON.
Remove SK_BUILD_JSON_WRITER, which was only there so
we could build without JSON it in the framework.
BUG=skia:2448
R=djsollen@google.com, reed@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/303913002
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/PictureResultsWriter.h | 2 | ||||
| -rw-r--r-- | tools/bench_pictures_main.cpp | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/tools/PictureResultsWriter.h b/tools/PictureResultsWriter.h index 9aa33b52ec..272a50c4c3 100644 --- a/tools/PictureResultsWriter.h +++ b/tools/PictureResultsWriter.h @@ -140,7 +140,6 @@ private: SkString currentLine; }; -#ifdef SK_BUILD_JSON_WRITER /** * This PictureResultsWriter collects data in a JSON node * @@ -227,6 +226,5 @@ private: Json::Value *fCurrentTileSet; Json::Value *fCurrentTile; }; -#endif // SK_BUILD_JSON_WRITER #endif diff --git a/tools/bench_pictures_main.cpp b/tools/bench_pictures_main.cpp index c267c4cb9b..6b76bfc8ef 100644 --- a/tools/bench_pictures_main.cpp +++ b/tools/bench_pictures_main.cpp @@ -39,9 +39,7 @@ DEFINE_string(filter, "", "Specific flags are listed above."); DEFINE_string(logFile, "", "Destination for writing log output, in addition to stdout."); DEFINE_bool(logPerIter, false, "Log each repeat timer instead of mean."); -#ifdef SK_BUILD_JSON_WRITER DEFINE_string(jsonLog, "", "Destination for writing JSON data."); -#endif DEFINE_bool(min, false, "Print the minimum times (instead of average)."); DECLARE_int32(multi); DECLARE_string(readPath); @@ -419,14 +417,12 @@ int tool_main(int argc, char** argv) { } } -#ifdef SK_BUILD_JSON_WRITER SkAutoTDelete<PictureJSONResultsWriter> jsonWriter; if (FLAGS_jsonLog.count() == 1) { jsonWriter.reset(SkNEW(PictureJSONResultsWriter(FLAGS_jsonLog[0]))); gWriter.add(jsonWriter.get()); } -#endif gWriter.add(&gLogWriter); |