diff options
| author |  Ben Wagner <bungeman@google.com> | 2018-03-27 10:57:43 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-27 16:36:29 +0000 |
| commit | 6ce482aed42630d451e07228b57de8ccced0601d (patch) | |
| tree | f07f77f3c2c00529f0faf6245b0b62c45c546e75 | |
| parent | f80c8ecdaa2d067b76fdbb0aa748a67645b57ffa (diff) | |
Remove include/svg from public.bzl includes.
It's strange to include it since public.bzl currently excludes all of
the source files that define the symbols declared in the headers in this
directory.
This also fixes the two files which needed to put some of these includes
behind the SK_XML macro. The public.bzl never defines the SK_XML macro,
so there is no need to ever have the include/svg directory on the
include path, even for DM.
Change-Id: I6cc18908aa16cfc914ed9b7ab174d03a0a242aa4
Reviewed-on: https://skia-review.googlesource.com/116547
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
| -rw-r--r-- | dm/DMSrcSink.cpp | 2 | ||||
| -rw-r--r-- | public.bzl | 2 | ||||
| -rw-r--r-- | tests/SVGDeviceTest.cpp | 7 |
3 files changed, 5 insertions, 6 deletions
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index 8650a5dd2a..45977c0586 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -47,7 +47,6 @@ #include "SkRandom.h" #include "SkRecordDraw.h" #include "SkRecorder.h" -#include "SkSVGCanvas.h" #include "SkStream.h" #include "SkSurfaceCharacterization.h" #include "SkSwizzler.h" @@ -66,6 +65,7 @@ #endif #if defined(SK_XML) + #include "SkSVGCanvas.h" #include "SkSVGDOM.h" #include "SkXMLWriter.h" #endif diff --git a/public.bzl b/public.bzl index 0936c92c70..9ae6e7d438 100644 --- a/public.bzl +++ b/public.bzl @@ -402,7 +402,6 @@ INCLUDES = [ "include/pathops", "include/ports", "include/private", - "include/svg", "include/utils", "include/utils/mac", "src/codec", @@ -483,7 +482,6 @@ DM_SRCS_ALL = struct( exclude = [ "tests/FontMgrAndroidParserTest.cpp", # Android-only. "tests/skia_test.cpp", # Old main. - "tests/SVGDeviceTest.cpp", "tools/gpu/atlastext/*", "tools/gpu/gl/angle/*", "tools/gpu/gl/egl/*", diff --git a/tests/SVGDeviceTest.cpp b/tests/SVGDeviceTest.cpp index bdd832c43b..b55a35fc56 100644 --- a/tests/SVGDeviceTest.cpp +++ b/tests/SVGDeviceTest.cpp @@ -8,21 +8,22 @@ #include "SkBitmap.h" #include "SkCanvas.h" -#include "SkDOM.h" #include "SkData.h" #include "SkImage.h" #include "SkImageShader.h" #include "SkParse.h" -#include "SkSVGCanvas.h" #include "SkShader.h" #include "SkStream.h" -#include "SkXMLWriter.h" #include "Test.h" #include <string.h> #ifdef SK_XML +#include "SkDOM.h" +#include "SkSVGCanvas.h" +#include "SkXMLWriter.h" + namespace { |