From 6ccd2cabaac810edccab620d8a944f64b0432d44 Mon Sep 17 00:00:00 2001 From: Leon Scroggins III Date: Thu, 26 Jan 2017 17:21:27 -0500 Subject: 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 Commit-Queue: Leon Scroggins --- third_party/jsoncpp/BUILD.gn | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'third_party/jsoncpp') 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 + } } -- cgit v1.2.3