diff options
| author |  Ben Wagner <bungeman@google.com> | 2018-03-26 15:46:40 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-26 20:18:46 +0000 |
| commit | 4ccf49c1bf312558f57d9b0339529c0cc6b235a1 (patch) | |
| tree | f77d1c1a69b39c433d595cf71317c00c3a979b52 /public.bzl | |
| parent | 8f7e28f3ae262450c5b04deded9fa23041757868 (diff) | |
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 <mtklein@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'public.bzl')
| -rw-r--r-- | public.bzl | 18 |
1 files changed, 8 insertions, 10 deletions
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", |