In Android framework, make tools depend on jsoncpp

dm/DM.cpp

 // Main binary for DM.
 // For a high-level overview, please see dm/README.
 
 #include "SkBenchmark.h"
 #include "SkCommandLineFlags.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
 #include "SkPicture.h"
 #include "SkString.h"
 #include "Test.h"
@@ skipping 20 matching lines @@
 
 #include <ctype.h>
 
 using skiagm::GM;
 using skiagm::GMRegistry;
 using skiatest::Test;
 using skiatest::TestRegistry;
 
 DEFINE_int32(threads, -1, "Threads for CPU work. Default NUM_CPUS.");
 DEFINE_int32(gpuThreads, 1, "Threads for GPU work.");
-#ifdef SK_BUILD_JSON_WRITER
 DEFINE_string2(expectations, r, "",
                "If a directory, compare generated images against images under this path. "
                "If a file, compare generated images against JSON expectations at this path."
 );
-#else
-DEFINE_string2(expectations, r, "",
-               "If a directory, compare generated images against images under this path. "
-);
-#endif
 DEFINE_string2(resources, i, "resources", "Path to resources directory.");
 DEFINE_string(match, "",  "[~][^]substring[$] [...] of GM name to run.\n"
                           "Multiple matches may be separated by spaces.\n"
                           "~ causes a matching GM to always be skipped\n"
                           "^ requires the start of the GM to match\n"
                           "$ requires the end of the GM to match\n"
                           "^ and $ requires an exact match\n"
                           "If a GM does not match any list entry,\n"
                           "it is skipped unless some list entry starts with ~");
 DEFINE_string(config, "565 8888 pdf gpu nonrendering",
@@ skipping 181 matching lines @@
     SkTDArray<GMRegistry::Factory> gms;
     SkAutoTDelete<DM::Expectations> expectations(SkNEW(DM::NoExpectations));
     if (FLAGS_gms) {
         append_matching_factories<GM>(GMRegistry::Head(), &gms);
 
         if (FLAGS_expectations.count() > 0) {
             const char* path = FLAGS_expectations[0];
             if (sk_isdir(path)) {
                 expectations.reset(SkNEW_ARGS(DM::WriteTask::Expectations, (path)));
             } else {
-#ifdef SK_BUILD_JSON_WRITER
                 expectations.reset(SkNEW_ARGS(DM::JsonExpectations, (path)));
-#endif
             }
         }
     }
 
     SkTDArray<BenchRegistry::Factory> benches;
     if (FLAGS_benches) {
         append_matching_factories<SkBenchmark>(BenchRegistry::Head(), &benches);
     }
 
     SkTDArray<TestRegistry::Factory> tests;
@@ skipping 17 matching lines @@
     reporter.getFailures(&failures);
     report_failures(failures);
     return failures.count() > 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
 int main(int argc, char** argv) {
     return tool_main(argc, argv);
 }
 #endif