In Android framework, make tools depend on jsoncpp

gyp/common_variables.gypi

 # Copyright 2012 The Android Open Source Project
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   # Get ready for the ugly...
   #
   # - We have to nest our variables dictionaries multiple levels deep, so that
   #   this and other gyp files can rely on previously-set variable values in
@@ skipping 46 matching lines @@
       # (skia_os will depend on skia_android_framework.)
       'skia_android_framework%': '<(skia_android_framework)',
       'skia_arch_type%': '<(skia_arch_type)',
       'arm_version%': '<(arm_version)',
       'arm_neon%': '<(arm_neon)',
 
       'conditions': [
         [ 'skia_android_framework == 1', {
           'skia_os%': 'android',
           'skia_chrome_utils%': 0,
-          # FIXME (scroggo): JSON is disabled in Android framework until we
-          # solve skbug.com/2448
-          'skia_build_json_writer%': 0,
+          'skia_use_system_json%': 1,
         }, {
           'skia_os%': '<(skia_os)',
           'skia_chrome_utils%': 1,
-          'skia_build_json_writer%': 1,
+          'skia_use_system_json%': 0,
         }],
         [ 'skia_os == "win"', {
           'os_posix%': 0,
         }, {
           'os_posix%': 1,
         }],
         [ 'skia_os in ["linux"]', {
           'skia_poppler_enabled%': 1,
         }, {
           'skia_poppler_enabled%': 0,
@@ skipping 113 matching lines @@
     'skia_freetype_static%': '<(skia_freetype_static)',
     'skia_giflib_static%': '<(skia_giflib_static)',
     'skia_libpng_static%': '<(skia_libpng_static)',
     'skia_zlib_static%': '<(skia_zlib_static)',
     'skia_no_fontconfig%': '<(skia_no_fontconfig)',
     'skia_sanitizer%': '<(skia_sanitizer)',
     'skia_scalar%': '<(skia_scalar)',
     'skia_mesa%': '<(skia_mesa)',
     'skia_stroke_path_rendering%': '<(skia_stroke_path_rendering)',
     'skia_android_framework%': '<(skia_android_framework)',
-    'skia_build_json_writer%': '<(skia_build_json_writer)',
+    'skia_use_system_json%': '<(skia_use_system_json)',
     'skia_android_path_rendering%': '<(skia_android_path_rendering)',
     'skia_resource_cache_mb_limit%': '<(skia_resource_cache_mb_limit)',
     'skia_resource_cache_count_limit%': '<(skia_resource_cache_count_limit)',
     'skia_angle%': '<(skia_angle)',
     'skia_poppler_enabled%': '<(skia_poppler_enabled)',
     'skia_arch_width%': '<(skia_arch_width)',
     'skia_arch_type%': '<(skia_arch_type)',
     'skia_chrome_utils%': '<(skia_chrome_utils)',
     'skia_directwrite%': '<(skia_directwrite)',
     'skia_gpu%': '<(skia_gpu)',
     'skia_win_exceptions%': 0,
     'skia_osx_deployment_target%': '<(skia_osx_deployment_target)',
     'skia_profile_enabled%': '<(skia_profile_enabled)',
     'skia_shared_lib%': '<(skia_shared_lib)',
     'skia_opencl%': '<(skia_opencl)',
     'skia_force_distancefield_fonts%': '<(skia_force_distancefield_fonts)',
     'skia_static_initializers%': '<(skia_static_initializers)',
     'ios_sdk_version%': '6.0',
     'skia_win_debuggers_path%': '<(skia_win_debuggers_path)',
     'skia_run_pdfviewer_in_gm%': 0,
     'skia_disable_inlining%': 0,
     'skia_moz2d%': 0,
 
     # These are referenced by our .gypi files that list files (e.g. core.gypi)
     #
     'skia_src_path%': '../src',
     'skia_include_path%': '../include',
   },
 }