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 /dm | |
| parent | b59161f0000eb4aca3dcef29f27ffd0fb5a568e5 (diff) | |
| download | skia-f01a6c3663970ccd6e1882e76a887e0fda467b77.tar.gz | |
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 'dm')
| -rw-r--r-- | dm/DM.cpp | 8 | ||||
| -rw-r--r-- | dm/DMExpectations.h | 2 |
2 files changed, 0 insertions, 10 deletions
@@ -38,16 +38,10 @@ using skiatest::TestRegistry; DEFINE_int32(threads, -1, "Threads for CPU work. Default NUM_CPUS."); DEFINE_int32(gpuThreads, 1, "Threads for GPU work."); -#ifdef SK_BUILD_JSON_WRITER DEFINE_string2(expectations, r, "", "If a directory, compare generated images against images under this path. " "If a file, compare generated images against JSON expectations at this path." ); -#else -DEFINE_string2(expectations, r, "", - "If a directory, compare generated images against images under this path. " -); -#endif DEFINE_string2(resources, i, "resources", "Path to resources directory."); DEFINE_string(match, "", "[~][^]substring[$] [...] of GM name to run.\n" "Multiple matches may be separated by spaces.\n" @@ -249,9 +243,7 @@ int tool_main(int argc, char** argv) { if (sk_isdir(path)) { expectations.reset(SkNEW_ARGS(DM::WriteTask::Expectations, (path))); } else { -#ifdef SK_BUILD_JSON_WRITER expectations.reset(SkNEW_ARGS(DM::JsonExpectations, (path))); -#endif } } } diff --git a/dm/DMExpectations.h b/dm/DMExpectations.h index 5509709104..238d1c5bea 100644 --- a/dm/DMExpectations.h +++ b/dm/DMExpectations.h @@ -19,7 +19,6 @@ public: bool check(const Task&, SkBitmap) const SK_OVERRIDE { return true; } }; -#ifdef SK_BUILD_JSON_WRITER class JsonExpectations : public Expectations { public: explicit JsonExpectations(const char* path) : fGMExpectations(path) {} @@ -41,7 +40,6 @@ public: private: skiagm::JsonExpectationsSource fGMExpectations; }; -#endif } // namespace DM |