In Android framework, make tools depend on jsoncpp

bench/TimerData.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 "TimerData.h"
 
 #include "BenchTimer.h"
@@ skipping 122 matching lines @@
     }
     if (timerFlags & kTruncatedCpu_Flag) {
         str += truncCpuStr;
     }
     if ((timerFlags & kGpu_Flag) && gpuSum > 0) {
         str += gpuStr;
     }
     return str;
 }
 
-#ifdef SK_BUILD_JSON_WRITER
 Json::Value TimerData::getJSON(uint32_t timerFlags,
                                Result result,
                                int itersPerTiming) {
     SkASSERT(itersPerTiming >= 1);
     Json::Value dataNode;
     Json::Value wallNode, truncWall, cpuNode, truncCpu, gpuNode;
     if (!fCurrTiming) {
         return dataNode;
     }
 
@@ skipping 62 matching lines @@
         dataNode["cpu"] = cpuNode;
     }
     if (timerFlags & kTruncatedCpu_Flag) {
         dataNode["trucCpu"] = truncCpu;
     }
     if ((timerFlags & kGpu_Flag) && gpuSum > 0) {
         dataNode["gpu"] = gpuNode;
     }
     return dataNode;
 }
-#endif  // SK_BUILD_JSON_WRITER