From f01a6c3663970ccd6e1882e76a887e0fda467b77 Mon Sep 17 00:00:00 2001 From: scroggo Date: Wed, 18 Jun 2014 10:31:40 -0700 Subject: 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 --- bench/ResultsWriter.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'bench/ResultsWriter.h') diff --git a/bench/ResultsWriter.h b/bench/ResultsWriter.h index c66593864f..e089d7fd07 100644 --- a/bench/ResultsWriter.h +++ b/bench/ResultsWriter.h @@ -77,7 +77,6 @@ private: const char* fTimeFormat; }; -#ifdef SK_BUILD_JSON_WRITER /** * This ResultsWriter handles writing out the results in JSON. * @@ -146,8 +145,6 @@ private: Json::Value* fConfig; }; -#endif // SK_BUILD_JSON_WRITER - /** * This ResultsWriter writes out to multiple ResultsWriters. */ -- cgit v1.2.3