diff options
| author |  Leon Scroggins III <scroggo@google.com> | 2017-01-26 17:21:27 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-27 20:02:23 +0000 |
| commit | 6ccd2cabaac810edccab620d8a944f64b0432d44 (patch) | |
| tree | e25c0c088be285e6b990a5824c016c5a986cac70 /third_party/jsoncpp | |
| parent | 91af72703830f3946c538b47c6c7c96afc0adde2 (diff) | |
Generate Android build targets for dm and nanobench
Generate targets for dm and nanobench from ninja and add them to the
generated Android.bp file.
Remove nanobenchAndroid and SkAndroidSDKCanvas. These rely on HWUI
internals and are currently unused.
Update gyp file references to removed files, just in case.
Change-Id: Ic6ae18a70bfd0c33804e7996d077f2081dfdfe07
Reviewed-on: https://skia-review.googlesource.com/7635
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'third_party/jsoncpp')
| -rw-r--r-- | third_party/jsoncpp/BUILD.gn | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/third_party/jsoncpp/BUILD.gn b/third_party/jsoncpp/BUILD.gn index 4122692dcf..34150c08b0 100644 --- a/third_party/jsoncpp/BUILD.gn +++ b/third_party/jsoncpp/BUILD.gn @@ -4,18 +4,25 @@ # found in the LICENSE file. declare_args() { + skia_use_system_jsoncpp = false } import("../third_party.gni") -third_party("jsoncpp") { - public_include_dirs = [ "../externals/jsoncpp/include" ] +if (skia_use_system_jsoncpp) { + system("jsoncpp") { + libs = [ "jsoncpp" ] + } +} else { + third_party("jsoncpp") { + public_include_dirs = [ "../externals/jsoncpp/include" ] - defines = [ "JSON_USE_EXCEPTION=0" ] - sources = [ - "../externals/jsoncpp/src/lib_json/json_reader.cpp", - "../externals/jsoncpp/src/lib_json/json_value.cpp", - "../externals/jsoncpp/src/lib_json/json_writer.cpp", - ] - testonly = true + defines = [ "JSON_USE_EXCEPTION=0" ] + sources = [ + "../externals/jsoncpp/src/lib_json/json_reader.cpp", + "../externals/jsoncpp/src/lib_json/json_value.cpp", + "../externals/jsoncpp/src/lib_json/json_writer.cpp", + ] + testonly = true + } } |