From 0f66681ff1c7a2b22d89424ba69e3a5bb8c40b0b Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Thu, 22 Mar 2018 15:21:12 -0400 Subject: BUILD: build when !skia_use_expat Change-Id: I17a695c64be0e2081ad4937b23038b7ce88ae293 Reviewed-on: https://skia-review.googlesource.com/115988 Reviewed-by: Mike Klein Commit-Queue: Hal Canary --- BUILD.gn | 66 +++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 34 insertions(+), 32 deletions(-) (limited to 'BUILD.gn') diff --git a/BUILD.gn b/BUILD.gn index 3ff387a266..1c49e51921 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1331,15 +1331,13 @@ if (skia_enable_tools) { } deps = [ ":experimental_sksg", + ":experimental_svg_model", ":flags", ":skia", ":tool_utils", "//third_party/libpng", "//third_party/zlib", ] - if (skia_use_expat) { - deps += [ ":experimental_svg_model" ] - } public_deps = [ ":gpu_tool_utils", # Test.h #includes headers from this target. ] @@ -1375,35 +1373,39 @@ if (skia_enable_tools) { } test_lib("experimental_svg_model") { - public_include_dirs = [ "experimental/svg/model" ] - sources = [ - "experimental/svg/model/SkSVGAttribute.cpp", - "experimental/svg/model/SkSVGAttributeParser.cpp", - "experimental/svg/model/SkSVGCircle.cpp", - "experimental/svg/model/SkSVGClipPath.cpp", - "experimental/svg/model/SkSVGContainer.cpp", - "experimental/svg/model/SkSVGDOM.cpp", - "experimental/svg/model/SkSVGEllipse.cpp", - "experimental/svg/model/SkSVGGradient.cpp", - "experimental/svg/model/SkSVGLine.cpp", - "experimental/svg/model/SkSVGLinearGradient.cpp", - "experimental/svg/model/SkSVGNode.cpp", - "experimental/svg/model/SkSVGPath.cpp", - "experimental/svg/model/SkSVGPattern.cpp", - "experimental/svg/model/SkSVGPoly.cpp", - "experimental/svg/model/SkSVGRadialGradient.cpp", - "experimental/svg/model/SkSVGRect.cpp", - "experimental/svg/model/SkSVGRenderContext.cpp", - "experimental/svg/model/SkSVGSVG.cpp", - "experimental/svg/model/SkSVGShape.cpp", - "experimental/svg/model/SkSVGStop.cpp", - "experimental/svg/model/SkSVGTransformableNode.cpp", - "experimental/svg/model/SkSVGUse.cpp", - "experimental/svg/model/SkSVGValue.cpp", - ] - deps = [ - ":skia", - ] + public_include_dirs = [] + if (skia_use_expat) { + public_include_dirs += [ "experimental/svg/model" ] + sources = [ + "experimental/svg/model/SkSVGAttribute.cpp", + "experimental/svg/model/SkSVGAttributeParser.cpp", + "experimental/svg/model/SkSVGCircle.cpp", + "experimental/svg/model/SkSVGClipPath.cpp", + "experimental/svg/model/SkSVGContainer.cpp", + "experimental/svg/model/SkSVGDOM.cpp", + "experimental/svg/model/SkSVGEllipse.cpp", + "experimental/svg/model/SkSVGGradient.cpp", + "experimental/svg/model/SkSVGLine.cpp", + "experimental/svg/model/SkSVGLinearGradient.cpp", + "experimental/svg/model/SkSVGNode.cpp", + "experimental/svg/model/SkSVGPath.cpp", + "experimental/svg/model/SkSVGPattern.cpp", + "experimental/svg/model/SkSVGPoly.cpp", + "experimental/svg/model/SkSVGRadialGradient.cpp", + "experimental/svg/model/SkSVGRect.cpp", + "experimental/svg/model/SkSVGRenderContext.cpp", + "experimental/svg/model/SkSVGSVG.cpp", + "experimental/svg/model/SkSVGShape.cpp", + "experimental/svg/model/SkSVGStop.cpp", + "experimental/svg/model/SkSVGTransformableNode.cpp", + "experimental/svg/model/SkSVGUse.cpp", + "experimental/svg/model/SkSVGValue.cpp", + ] + deps = [ + ":skia", + ":xml", + ] + } } test_lib("experimental_sksg") { -- cgit v1.2.3