commit 5d3ff438fe958622d3caced1aa7a49b2b02c17ee
author Florin Malita <fmalita@chromium.org> Tue Jul 31 16:38:43 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Aug 01 14:28:56 2018 +0000
tree 02040f1d33b8482a9c255e2973d10dabf1b78275
parent 70c787ae5bbca578342b2331b16b1622555f5ac1

Fix !defined(SK_XML) builds

Add guards for dependent code.

TBR=
Change-Id: I49c0c90a2defc6f39589721f95562e9e0f17db13
Reviewed-on: https://skia-review.googlesource.com/144610
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 14173a0..ede8fc4 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1674,15 +1674,17 @@
     ]
   }
 
-  test_app("create_test_font_color") {
-    sources = [
-      "tools/fonts/create_test_font_color.cpp",
-    ]
-    deps = [
-      ":flags",
-      ":skia",
-      ":tool_utils",
-    ]
+  if (skia_use_expat) {
+    test_app("create_test_font_color") {
+      sources = [
+        "tools/fonts/create_test_font_color.cpp",
+      ]
+      deps = [
+        ":flags",
+        ":skia",
+        ":tool_utils",
+      ]
+    }
   }
 
   test_app("get_images_from_skps") {

tools/skpbench/skpbench.cpp

diff --git a/tools/skpbench/skpbench.cpp b/tools/skpbench/skpbench.cpp
index 55fbc00..8084ca9 100644
--- a/tools/skpbench/skpbench.cpp
+++ b/tools/skpbench/skpbench.cpp
@@ -533,6 +533,7 @@
     return recorder.finishRecordingAsPicture();
 #endif
     exitf(ExitErr::kData, "SK_XML is disabled; cannot open svg file %s", filename);
+    return nullptr;
 }
 
 bool mkdir_p(const SkString& dirname) {

tools/viewer/SvgSlide.cpp

diff --git a/tools/viewer/SvgSlide.cpp b/tools/viewer/SvgSlide.cpp
index 41dc318..9ea9e40 100644
--- a/tools/viewer/SvgSlide.cpp
+++ b/tools/viewer/SvgSlide.cpp
@@ -7,6 +7,8 @@
 
 #include "SvgSlide.h"
 
+#if defined(SK_XML)
+
 #include "SkCanvas.h"
 #include "SkStream.h"
 #include "SkSVGDOM.h"
@@ -41,3 +43,5 @@
         fDom->render(canvas);
     }
 }
+
+#endif // SK_XML

tools/viewer/Viewer.cpp

diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp
index 94db6f7..17277fc 100644
--- a/tools/viewer/Viewer.cpp
+++ b/tools/viewer/Viewer.cpp
@@ -530,10 +530,12 @@
                 return sk_make_sp<SkottieSlide>(name, path);}
         },
 #endif
+#if defined(SK_XML)
         { ".svg", "svg-dir", FLAGS_svgs,
             [](const SkString& name, const SkString& path) -> sk_sp<Slide> {
                 return sk_make_sp<SvgSlide>(name, path);}
         },
+#endif
 #if !(defined(SK_BUILD_FOR_WIN) && defined(__clang__))
         { ".nima", "nima-dir", FLAGS_nimas,
             [](const SkString& name, const SkString& path) -> sk_sp<Slide> {