In Android framework, make tools depend on jsoncpp

Always build the tools with JSON, but either build our own
or use the system's.

Rename skia_build_json_writer to skia_use_system_jsoncpp,
since we now always build with JSON.

Remove SK_BUILD_JSON_WRITER, which was only there so
we could build without JSON it in the framework.

BUG=skia:2448
R=djsollen@google.com, reed@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/303913002

1 files changed, 0 insertions, 12 deletions

diff --git a/gm/gm_expectations.h b/gm/gm_expectations.h
index c69fafc130..1cd6a1f756 100644
--- a/gm/gm_expectations.h
+++ b/gm/gm_expectations.h
@@ -22,13 +22,11 @@
 
 namespace skiagm {
 
-#ifdef SK_BUILD_JSON_WRITER
     Json::Value CreateJsonTree(Json::Value expectedResults,
                                Json::Value actualResultsFailed,
                                Json::Value actualResultsFailureIgnored,
                                Json::Value actualResultsNoComparison,
                                Json::Value actualResultsSucceeded);
-#endif
     /**
      * The digest of a GM test result.
      *
@@ -42,14 +40,12 @@ namespace skiagm {
          */
         explicit GmResultDigest(const SkBitmap &bitmap);
 
-#ifdef SK_BUILD_JSON_WRITER
         /**
          * Create a ResultDigest representing an allowed result
          * checksum within JSON expectations file, in the form
          * ["bitmap-64bitMD5", 12345].
          */
         explicit GmResultDigest(const Json::Value &jsonTypeValuePair);
-#endif
 
         /**
          * Returns true if this GmResultDigest was fully and successfully
@@ -63,13 +59,11 @@ namespace skiagm {
          */
         bool equals(const GmResultDigest &other) const;
 
-#ifdef SK_BUILD_JSON_WRITER
         /**
          * Returns a JSON type/value pair representing this result,
          * such as ["bitmap-64bitMD5", 12345].
          */
         Json::Value asJsonTypeValuePair() const;
-#endif
 
         /**
          * Returns the hashtype, such as "bitmap-64bitMD5", as an SkString.
@@ -118,7 +112,6 @@ namespace skiagm {
          */
         explicit Expectations(const BitmapAndDigest& bitmapAndDigest);
 
-#ifdef SK_BUILD_JSON_WRITER
         /**
          * Create Expectations from a JSON element as found within the
          * kJsonKey_ExpectedResults section.
@@ -127,7 +120,6 @@ namespace skiagm {
          * don't have any expectations.
          */
         explicit Expectations(Json::Value jsonElement);
-#endif
 
         /**
          * Returns true iff we want to ignore failed expectations.
@@ -161,12 +153,10 @@ namespace skiagm {
             return (kUnknown_SkColorType == fBitmap.colorType()) ? NULL : &fBitmap;
         }
 
-#ifdef SK_BUILD_JSON_WRITER
         /**
          * Return a JSON representation of the expectations.
          */
         Json::Value asJsonValue() const;
-#endif
 
     private:
         const static bool kDefaultIgnoreFailure = false;
@@ -209,7 +199,6 @@ namespace skiagm {
         const SkString fRootDir;
     };
 
-#ifdef SK_BUILD_JSON_WRITER
     /**
      * Return Expectations based on JSON summary file.
      */
@@ -237,7 +226,6 @@ namespace skiagm {
         Json::Value fJsonRoot;
         Json::Value fJsonExpectedResults;
     };
-#endif // SK_BUILD_JSON_WRITER
 
 }
 #endif