Generate bench/Android.mk from gyp.

bench/ResultsWriter.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  * Classes for writing out bench results in various formats.
  */
 #ifndef SkResultsWriter_DEFINED
 #define SkResultsWriter_DEFINED
 
 #include "SkBenchLogger.h"
 #include "SkJSONCPP.h"

[hal.canary, 2014/05/15 14:29:36]

For example:

#ifdef SK_BUILD_JSON_WRITER
    #include "SkJSONCPP.h"
#endif  // SK_BUILD_JSON_WRITER

[scroggo, 2014/05/15 20:00:54]

Good thought. In the spirit of simplifying things further, I'd prefer to put the
check inside SkJSONCPP.h

 #include "SkStream.h"
 #include "SkString.h"
 #include "SkTArray.h"
 #include "SkTypes.h"
 
 
 /**
  * Base class for writing out the bench results.
  *
  * TODO(jcgregorio) Add info if tests fail to converge?
@@ skipping 46 matching lines @@
         fLogger.logProgress(SkStringPrintf(fTimeFormat, ms));
     }
     virtual void end() {
         fLogger.logProgress("\n");
     }
 private:
     SkBenchLogger& fLogger;
     const char* fTimeFormat;
 };
 
+// FIXME (scroggo): JSON is disabled in Android framework until we solve
+// skbug.com/2448
+#ifndef SK_BUILD_FOR_ANDROID

[hal.canary, 2014/05/15 14:29:36]

#ifdef SK_BUILD_JSON_WRITER

[scroggo, 2014/05/15 20:00:54]

Done.

 /**
  * This ResultsWriter handles writing out the results in JSON.
  *
  * The output looks like:
  *
  *  {
  *   "options" : {
  *      "alpha" : "0xFF",
  *      "scale" : "0",
  *      ...
@@ skipping 36 matching lines @@
         stream.flush();
     }
 private:
     SkString fFilename;
     Json::Value fRoot;
     Json::Value& fResults;
     Json::Value* fBench;
     Json::Value* fConfig;
 };
 
+#endif // SK_BUILD_FOR_ANDROID_FRAMEWORK
 /**
  * This ResultsWriter writes out to multiple ResultsWriters.
  */
 class MultiResultsWriter : public ResultsWriter {
 public:
     MultiResultsWriter() : writers() {
     };
     void add(ResultsWriter* writer) {
       writers.push_back(writer);
     }
@@ skipping 31 matching lines @@
  */
 template <typename T> class CallEnd : SkNoncopyable {
 public:
     CallEnd(T& obj) : fObj(obj) {}
     ~CallEnd() { fObj.end(); }
 private:
     T&  fObj;
 };
 
 #endif