aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp/jsoncpp.gyp
Commit message (Collapse)AuthorAge
* Roll jsoncpp, drop dependency on Chromium overrides.Gravatar mtklein2014-08-19
| | | | | | | | | | | | | | | | This rolls jsoncpp to head, crucially past "Added missing includes for std::istream." which has given us some grief in the past. And it's required to build jsoncpp against libc++. Vanilla jsoncpp works just fine for us, so no need for Chromium's overrides. Like all DEPS, only tools depend on jsoncpp. BUG=skia: R=bungeman@google.com, mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/481823003
* 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
* 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
* Remove the comments settings for vim tab width and expansion variables.Gravatar commit-bot@chromium.org2013-12-02
| | | | | | | | | | | | | | | | | | These add unnecessary bloat for everyone to carry around, so we just remove them now. The same change was made in chromium by Tony in http://codereview.chromium.org/7310019 - crrev.com/92046 BUG=None TEST=./gyp_skia R=mtklein@google.com Author: tfarina@chromium.org Review URL: https://codereview.chromium.org/92673003 git-svn-id: http://skia.googlecode.com/svn/trunk@12443 2bbb7eff-a529-9590-31e7-b0007b416f81
* quiet down more third-party warnings in poppler and jsoncppGravatar commit-bot@chromium.org2013-09-30
| | | | | | | | | | | BUG= R=djsollen@google.com Author: mtklein@google.com Review URL: https://codereview.chromium.org/25319002 git-svn-id: http://skia.googlecode.com/svn/trunk@11530 2bbb7eff-a529-9590-31e7-b0007b416f81
* Refactor skia_warnings_as_errorsGravatar borenet@google.com2013-03-22
| | | | | | Review URL: https://codereview.chromium.org/12963002 git-svn-id: http://skia.googlecode.com/svn/trunk@8330 2bbb7eff-a529-9590-31e7-b0007b416f81
* Turning on warning as error on LinuxGravatar sugoi@google.com2013-03-11
| | | | | | | | | Fixed the few remaining warnings and turned on warning as error on Linux. Explicitly turned off warning as error in libjpeg, cityhash and json. Review URL: https://codereview.chromium.org/12521010 git-svn-id: http://skia.googlecode.com/svn/trunk@8067 2bbb7eff-a529-9590-31e7-b0007b416f81
* Fix errors when compiling with -Wall -Werror on Android.Gravatar djsollen@google.com2013-02-07
| | | | | | | | This CL also turns those features on by default on Android Review URL: https://codereview.appspot.com/7313049 git-svn-id: http://skia.googlecode.com/svn/trunk@7645 2bbb7eff-a529-9590-31e7-b0007b416f81
* Separate our jsoncpp dependency from Chromium's jsoncpp overrides.Gravatar epoger@google.com2013-01-15
| | | | | | | BUG=https://code.google.com/p/skia/issues/detail?id=909 Review URL: https://codereview.appspot.com/7098047 git-svn-id: http://skia.googlecode.com/svn/trunk@7187 2bbb7eff-a529-9590-31e7-b0007b416f81
* Enable warnings-as-errors on Windows.Gravatar bsalomon@google.com2013-01-08
| | | | | | Review URL: https://codereview.appspot.com/7066054 git-svn-id: http://skia.googlecode.com/svn/trunk@7094 2bbb7eff-a529-9590-31e7-b0007b416f81
* disable warnings-as-error for JSON code, which has warnings (at least on mac)Gravatar reed@google.com2013-01-07
| | | | | | Review URL: https://codereview.appspot.com/7064053 git-svn-id: http://skia.googlecode.com/svn/trunk@7068 2bbb7eff-a529-9590-31e7-b0007b416f81
* Re-land r6843 with copied gyp file to (hopefully) fix Windows buildGravatar epoger@google.com2012-12-18
BUG=https://code.google.com/p/skia/issues/detail?id=1023 Review URL: https://codereview.appspot.com/6943073 git-svn-id: http://skia.googlecode.com/svn/trunk@6880 2bbb7eff-a529-9590-31e7-b0007b416f81
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-27 13:14:33 +0000