Generate bench/Android.mk from gyp.

include/utils/SkJSONCPP.h

Index: include/utils/SkJSONCPP.h
diff --git a/include/utils/SkJSONCPP.h b/include/utils/SkJSONCPP.h
index 8dbb40c91bedfa3c52a56415a9e041a030a58a28..da11eb44f6cf26047665189c7ed7d0a357967a79 100644
--- a/include/utils/SkJSONCPP.h
+++ b/include/utils/SkJSONCPP.h
@@ -10,6 +10,10 @@
 #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;
@@ -23,4 +27,6 @@
     #pragma warning(pop)
 #endif
 
+#endif // SK_BUILD_FOR_ANDROID_FRAMEWORK
+
 #endif