aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/utils/SkJSONCPP.h
Commit message (Collapse)AuthorAge
* upstream google3 include paths for jsoncppGravatar mtklein2015-01-14
| | | | | | | | | BUG=skia: No public API changes TBR=reed@google.com Review URL: https://codereview.chromium.org/853613002
* In Android framework, make tools depend on jsoncppGravatar scroggo2014-06-18
| | | | | | | | | | | | | | | | | | 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
* Changed JSON formatting more, workaround bug where SkStringPrintf causes ↵Gravatar commit-bot@chromium.org2014-05-20
| | | | | | | | | | | | | encoding issues BUG=skia: R=bensong@google.com, jcgregorio@google.com, reed@google.com, bsalomon@google.com Author: kelvinly@google.com Review URL: https://codereview.chromium.org/294093002 git-svn-id: http://skia.googlecode.com/svn/trunk@14808 2bbb7eff-a529-9590-31e7-b0007b416f81
* Generate bench/Android.mk from gyp.Gravatar commit-bot@chromium.org2014-05-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now, remove json functionality and do not depend on json. This allows us to build and run until solving skbug.com/2448. bench/DeferredSurfaceCopyBench.cpp: Include GrRenderTarget last, so SK_SUPPORT_GPU will be set properly. bench/ResultsWriter.h: bench/benchmain.cpp: Remove JSONResultsWriter when SK_BUILD_JSON_WRITER is not defined, which is the case for the Android framework build. gyp/bench.gyp: Depend on skia and cutils (for android_atomic_inc etc). gyp/common_conditions.gypi: Define SK_BUILD_JSON_WRITER when skia_build_json_writer is set. gyp/common_variables.gypi: Add a flag for skia_build_json_writer, and set it only when skia_android_framework is not set. gyp/jsoncpp.gyp: Do not build jsoncpp when skia_build_json_writer is not defined. include/utils/SkJSONCPP.h: Do not include json headers when SK_BUILD_JSON_WRITER is not defined. platform_tools/android/bin/gyp_to_android.py: Generate bench/Android.mk. platform_tools/android/gyp_gen/gypd_parser.py: Skip dest_dir when checking for include_dirs. platform_tools/android/gyp_gen/makefile_writer.py: Build bench/Android.mk when building external/skia. platform_tools/android/gyp_gen/tool_makefile_writer.py: Add a parameter for putting the binary into /data/local/tmp. BUG=skia:2447 BUG=skia:2448 R=halcanary@google.com, reed@google.com Author: scroggo@google.com Review URL: https://codereview.chromium.org/282053002 git-svn-id: http://skia.googlecode.com/svn/trunk@14760 2bbb7eff-a529-9590-31e7-b0007b416f81
* Add JSON output option to bench.Gravatar commit-bot@chromium.org2013-12-03
A new command-line flag --outResultsFile takes the filename to write the JSON into. The human readable output is the same as before with one exception. Previously DEBUG would be printed if in debug mode, or nothing would be printed if in release mode. Now this is reported as a named option: build=DEBUG or build=RELEASE R=djsollen@google.com, bsalomon@google.com Author: jcgregorio@google.com Review URL: https://codereview.chromium.org/83863002 git-svn-id: http://skia.googlecode.com/svn/trunk@12465 2bbb7eff-a529-9590-31e7-b0007b416f81