In Android framework, make tools depend on jsoncpp

gm/gmmain.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /*
  * Code for the "gm" (Golden Master) rendering comparison tool.
  *
@@ skipping 851 matching lines @@
     }
 
     /**
      * Add this result to the appropriate JSON collection of actual results (but just ONE),
      * depending on errors encountered.
      */
     void add_actual_results_to_json_summary(const char testName[],
                                             const GmResultDigest &actualResultDigest,
                                             ErrorCombination errors,
                                             bool ignoreFailure) {
-#ifdef SK_BUILD_JSON_WRITER
         Json::Value jsonActualResults = actualResultDigest.asJsonTypeValuePair();
         Json::Value *resultCollection = NULL;
 
         if (errors.isEmpty()) {
             resultCollection = &this->fJsonActualResults_Succeeded;
         } else if (errors.includes(kRenderModeMismatch_ErrorType)) {
             resultCollection = &this->fJsonActualResults_Failed;
         } else if (errors.includes(kExpectationsMismatch_ErrorType)) {
             if (ignoreFailure) {
                 resultCollection = &this->fJsonActualResults_FailureIgnored;
@@ skipping 11 matching lines @@
             // JSON file, we should fix this (and add a test case for
             // which an expectation is given but the test is never
             // run).
             resultCollection = &this->fJsonActualResults_NoComparison;
         }
 
         // If none of the above cases match, we don't add it to ANY tally of actual results.
         if (resultCollection) {
             (*resultCollection)[testName] = jsonActualResults;
         }
-#endif
     }
 
     /**
      * Add this test to the JSON collection of expected results.
      */
     void add_expected_results_to_json_summary(const char testName[],
                                               Expectations expectations) {
-#ifdef SK_BUILD_JSON_WRITER
         this->fJsonExpectedResults[testName] = expectations.asJsonValue();
-#endif
     }
 
     /**
      * Compare actualBitmap to expectations stored in this->fExpectationsSource.
      *
      * @param gm which test generated the actualBitmap
      * @param gRec
      * @param configName The config name to look for in the expectation file.
      * @param actualBitmapAndDigest ptr to bitmap generated by this run, or NULL
      *        if we don't have a usable bitmap representation
@@ skipping 339 matching lines @@
     // collection of tests that have failed with each ErrorType
     SkTArray<SkString> fFailedTests[kLast_ErrorType+1];
     SkTArray<SkString> fTestsSkippedOnAllRenderModes;
     int fTestsRun;
     SkTDict<int> fRenderModesEncountered;
 
     // Where to read expectations (expected image hash digests, etc.) from.
     // If unset, we don't do comparisons.
     SkAutoTUnref<ExpectationsSource> fExpectationsSource;
 
-#ifdef SK_BUILD_JSON_WRITER
     // JSON summaries that we generate as we go (just for output).
     Json::Value fJsonExpectedResults;
     Json::Value fJsonActualResults_Failed;
     Json::Value fJsonActualResults_FailureIgnored;
     Json::Value fJsonActualResults_NoComparison;
     Json::Value fJsonActualResults_Succeeded;
-#endif
 }; // end of GMMain class definition
 
 #if SK_SUPPORT_GPU
 static const GLContextType kDontCare_GLContextType = GrContextFactory::kNative_GLContextType;
 #else
 static const GLContextType kDontCare_GLContextType = 0;
 #endif
 
 static const ConfigData gRec[] = {
     { kN32_SkColorType,     kRaster_Backend, kDontCare_GLContextType,                  0, kRW_ConfigFlag,    "8888",         true },
@@ skipping 176 matching lines @@
 DEFINE_bool(serialize, false, "Exercise the SkPicture serialization & deserialization test pass.");
 DEFINE_bool(simulatePipePlaybackFailure, false, "Simulate a rendering failure in pipe mode only.");
 DEFINE_bool(tiledPipe, false, "Exercise tiled SkGPipe replay.");
 DEFINE_bool(tileGrid, false, "Exercise the tile grid variant of SkPicture.");
 DEFINE_string(tileGridReplayScales, "", "Space separated list of floating-point scale "
               "factors to be used for tileGrid playback testing. Default value: 1.0");
 DEFINE_bool2(verbose, v, false, "Give more detail (e.g. list all GMs run, more info about "
              "each test).");
 DEFINE_bool(writeChecksumBasedFilenames, false, "When writing out actual images, use checksum-"
             "based filenames, as rebaseline.py will use when downloading them from Google Storage");
-#ifdef SK_BUILD_JSON_WRITER
 DEFINE_string(writeJsonSummaryPath, "", "Write a JSON-formatted result summary to this file.");
-#endif
 DEFINE_string2(writePath, w, "",  "Write rendered images into this directory.");
 DEFINE_string2(writePicturePath, p, "", "Write .skp files into this directory.");
 DEFINE_int32(pdfJpegQuality, -1, "Encodes images in JPEG at quality level N, "
              "which can be in range 0-100). N = -1 will disable JPEG compression. "
              "Default is N = 100, maximum quality.");
 // TODO(edisonn): pass a matrix instead of forcePerspectiveMatrix
 // Either the 9 numbers defining the matrix
 // or probably more readable would be to replace it with a set of a few predicates
 // Like --prerotate 100 200 10 --posttranslate 10, 10
 // Probably define spacial names like centerx, centery, top, bottom, left, right
@@ skipping 703 matching lines @@
             SkDebugf("readPath %s does not exist!\n", readPath);
             return false;
         }
         if (sk_isdir(readPath)) {
             if (FLAGS_verbose) {
                 SkDebugf("reading from %s\n", readPath);
             }
             gmmain->fExpectationsSource.reset(SkNEW_ARGS(
                 IndividualImageExpectationsSource, (readPath)));
         } else {
-#ifdef SK_BUILD_JSON_WRITER
             if (FLAGS_verbose) {
                 SkDebugf("reading expectations from JSON summary file %s\n", readPath);
             }
             gmmain->fExpectationsSource.reset(SkNEW_ARGS(JsonExpectationsSource, (readPath)));
-#endif
         }
     }
     return true;
 }
 
 static bool parse_flags_resource_path() {
     if (FLAGS_resourcePath.count() == 1) {
         GM::SetResourcePath(FLAGS_resourcePath[0]);
     }
     return true;
@@ skipping 186 matching lines @@
     // https://code.google.com/p/skia/issues/detail?id=1222
     // ('GM is unexpectedly skipping tests on Android')
 #ifndef SK_BUILD_FOR_ANDROID
     if (expectedNumberOfTests != gmmain.fTestsRun) {
         SkDebugf("expected %d tests, but ran or skipped %d tests\n",
                  expectedNumberOfTests, gmmain.fTestsRun);
         reportError = true;
     }
 #endif
 
-#ifdef SK_BUILD_JSON_WRITER
     if (FLAGS_writeJsonSummaryPath.count() == 1) {
         Json::Value root = CreateJsonTree(
             gmmain.fJsonExpectedResults,
             gmmain.fJsonActualResults_Failed, gmmain.fJsonActualResults_FailureIgnored,
             gmmain.fJsonActualResults_NoComparison, gmmain.fJsonActualResults_Succeeded);
         std::string jsonStdString = root.toStyledString();
         SkFILEWStream stream(FLAGS_writeJsonSummaryPath[0]);
         stream.write(jsonStdString.c_str(), jsonStdString.length());
     }
-#endif
 
 #if SK_SUPPORT_GPU
 
 #if GR_CACHE_STATS
     for (int i = 0; i < configs.count(); i++) {
         ConfigData config = gRec[configs[i]];
 
         if (FLAGS_verbose && (kGPU_Backend == config.fBackend)) {
             GrContext* gr = grFactory->get(config.fGLContextType);
 
@@ skipping 26 matching lines @@
     if (FLAGS_forceBWtext) {
         canvas->setDrawFilter(SkNEW(BWTextDrawFilter))->unref();
     }
 }
 
 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif