diff options
-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 { |