From 4ccf49c1bf312558f57d9b0339529c0cc6b235a1 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Mon, 26 Mar 2018 15:46:40 -0400 Subject: Add the xml and svg model code to DM in public.bzl. This also removes several include directories which no longer exist, as well as updates comments on why the xml and svg output code are not currently built as part of the base library. Change-Id: I27464bb09d8dd9c03d187662badb28c3ca558008 Reviewed-on: https://skia-review.googlesource.com/116540 Reviewed-by: Mike Klein Commit-Queue: Ben Wagner --- public.bzl | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'public.bzl') diff --git a/public.bzl b/public.bzl index fbd005bf0f..d8b28379c0 100644 --- a/public.bzl +++ b/public.bzl @@ -246,9 +246,9 @@ BASE_SRCS_ALL = struct( "src/pdf/SkDocument_PDF_None.cpp", # We use src/pdf/SkPDFDocument.cpp. "src/gpu/gl/GrGLMakeNativeInterface_none.cpp", - # Exclude files that don't compile with the current DEFINES. - "src/svg/**/*", # Depends on XML. - "src/xml/**/*", + # Exclude files that don't compile everywhere. + "src/svg/**/*", # Depends on xml, SkJpegCodec, and SkPngCodec. + "src/xml/**/*", # Avoid dragging in expat when not needed. # Conflicting dependencies among Lua versions. See cl/107087297. "src/utils/SkLua*", @@ -393,23 +393,17 @@ def skia_srcs(os_conditions): INCLUDES = [ "include/android", "include/c", - "include/client/android", "include/codec", "include/config", "include/core", "include/effects", "include/encode", "include/gpu", - "include/images", "include/pathops", - "include/pipe", "include/ports", "include/private", "include/utils", "include/utils/mac", - "include/utils/win", - "include/svg", - "include/xml", "src/codec", "src/core", "src/gpu", @@ -417,8 +411,8 @@ INCLUDES = [ "src/images", "src/lazy", "src/opts", - "src/ports", "src/pdf", + "src/ports", "src/sfnt", "src/shaders", "src/sksl", @@ -434,9 +428,13 @@ DM_SRCS_ALL = struct( include = [ "dm/*.cpp", "dm/*.h", + "experimental/svg/model/*.cpp", + "experimental/svg/model/*.h", "gm/*.c", "gm/*.cpp", "gm/*.h", + "src/xml/*.cpp", + "src/xml/*.h", "tests/*.cpp", "tests/*.h", "tools/BigPathBench.inc", -- cgit v1.2.3