In Android framework, make tools depend on jsoncpp

tools/bench_pictures_main.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "BenchTimer.h"
 #include "CopyTilesRenderer.h"
 #include "LazyDecodeBitmap.h"
@@ skipping 21 matching lines @@
 DECLARE_bool(deferImageDecoding);
 DEFINE_string(filter, "",
         "type:flag : Enable canvas filtering to disable a paint flag, "
         "use no blur or low quality blur, or use no hinting or "
         "slight hinting. For all flags except AAClip, specify the "
         "type of primitive to effect, or choose all. for AAClip "
         "alone, the filter affects all clips independent of type. "
         "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);
 DEFINE_int32(repeat, 1, "Set the number of times to repeat each test.");
 DEFINE_bool(timeIndividualTiles, false, "Report times for drawing individual tiles, rather than "
             "times for drawing the whole page. Requires tiled rendering.");
 DEFINE_bool(purgeDecodedTex, false, "Purge decoded and GPU-uploaded textures "
             "after each iteration.");
 DEFINE_string(timers, "c", "[wcgWC]*: Display wall, cpu, gpu, truncated wall or truncated cpu time"
               " for each picture.");
@@ skipping 357 matching lines @@
             SkString str;
             str.printf("Could not open %s for writing.\n", FLAGS_logFile[0]);
             gLogger.logError(str);
             // TODO(borenet): We're disabling this for now, due to
             // write-protected Android devices.  The very short-term
             // solution is to ignore the fact that we have no log file.
             //exit(-1);
         }
     }
 
-#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);
 
 
 #if SK_ENABLE_INST_COUNT
     gPrintInstCount = true;
 #endif
     SkAutoGraphics ag;
 
     sk_tools::PictureBenchmark benchmark;
 
@@ skipping 18 matching lines @@
 #endif
     gWriter.end();
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif