In Android framework, make tools depend on jsoncpp

bench/ResultsWriter.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  * Classes for writing out bench results in various formats.
  */
 #ifndef SkResultsWriter_DEFINED
 #define SkResultsWriter_DEFINED
@@ skipping 59 matching lines @@
         fLogger.logProgress(SkStringPrintf(fTimeFormat, ms));
     }
     virtual void end() {
         fLogger.logProgress("\n");
     }
 private:
     SkBenchLogger& fLogger;
     const char* fTimeFormat;
 };
 
-#ifdef SK_BUILD_JSON_WRITER
 /**
  * This ResultsWriter handles writing out the results in JSON.
  *
  * The output looks like (except compressed to a single line):
  *
  *  {
  *   "options" : {
  *      "alpha" : "0xFF",
  *      "scale" : "0",
  *      ...
@@ skipping 48 matching lines @@
     }
 private:
 
     SkString fFilename;
     Json::Value fRoot;
     Json::Value& fResults;
     Json::Value* fBench;
     Json::Value* fConfig;
 };
 
-#endif // SK_BUILD_JSON_WRITER
-
 /**
  * This ResultsWriter writes out to multiple ResultsWriters.
  */
 class MultiResultsWriter : public ResultsWriter {
 public:
     MultiResultsWriter() : writers() {
     };
     void add(ResultsWriter* writer) {
       writers.push_back(writer);
     }
@@ skipping 31 matching lines @@
  */
 template <typename T> class CallEnd : SkNoncopyable {
 public:
     CallEnd(T& obj) : fObj(obj) {}
     ~CallEnd() { fObj.end(); }
 private:
     T&  fObj;
 };
 
 #endif