Generate bench/Android.mk from gyp.

include/utils/SkJSONCPP.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.
  *
  * A common place to put the jsoncpp library includes, as opposed to littering
  * the pragmas repeatedly through our code.
  */
 #ifndef SkJSONCPP_DEFINED
 #define SkJSONCPP_DEFINED
 
+// FIXME (scroggo): JSON is disabled in Android framework until we solve
+// skbug.com/2448
+#ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK
+

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

Can we just not include this file?

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

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

As stated elsewhere, I think it's simpler to include this file but make it do
nothing if SK_BUILD_JSON_WRITER is not defined.

 #ifdef SK_BUILD_FOR_WIN
     // json includes xlocale which generates warning 4530 because we're
     // compiling without exceptions;
     // see https://code.google.com/p/skia/issues/detail?id=1067
     #pragma warning(push)
     #pragma warning(disable : 4530)
 #endif
 #include "json/reader.h"
 #include "json/value.h"
 #ifdef SK_BUILD_FOR_WIN
     #pragma warning(pop)
 #endif
 
+#endif // SK_BUILD_FOR_ANDROID_FRAMEWORK
+
 #endif