From 124d5afbff0b518ee1b8ffcf80ebcb26bc7d31f5 Mon Sep 17 00:00:00 2001
From: Florin Malita <fmalita@chromium.org>
Date: Sun, 31 Dec 2017 17:02:26 -0500
Subject: [skotty] Speculative g3 DM build fix

Disable Skotty support in G3 for now.

TBR=
Change-Id: Ic64f62bc21e9d4a531cdfa2495710edc1ba531f8
Reviewed-on: https://skia-review.googlesource.com/90029
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>
---
 dm/DM.cpp        | 2 ++
 dm/DMSrcSink.cpp | 7 ++++++-
 dm/DMSrcSink.h   | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'dm')

diff --git a/dm/DM.cpp b/dm/DM.cpp
index 246615eaa6..4728933f2c 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -784,7 +784,9 @@ static bool gather_srcs() {
         gather_file_srcs<SKPSrc>(FLAGS_skps, "skp");
     }
     gather_file_srcs<MSKPSrc>(FLAGS_mskps, "mskp");
+#if !defined(SK_BUILD_FOR_GOOGLE3)
     gather_file_srcs<SkottySrc>(FLAGS_jsons, "json");
+#endif
 #if defined(SK_XML)
     gather_file_srcs<SVGSrc>(FLAGS_svgs, "svg");
 #endif
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index beb55d9461..55b54f520b 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -32,7 +32,6 @@
 #include "SkMultiPictureDocumentPriv.h"
 #include "SkMultiPictureDraw.h"
 #include "SkNullCanvas.h"
-#include "Skotty.h"
 #include "SkOSFile.h"
 #include "SkOSPath.h"
 #include "SkOpts.h"
@@ -61,6 +60,10 @@
     #include <XpsObjectModel.h>
 #endif
 
+#if !defined(SK_BUILD_FOR_GOOGLE3)
+    #include "Skotty.h"
+#endif
+
 #if defined(SK_XML)
     #include "SkSVGDOM.h"
     #include "SkXMLWriter.h"
@@ -1313,6 +1316,7 @@ Name DDLSKPSrc::name() const { return SkOSPath::Basename(fPath.c_str()); }
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
+#if !defined(SK_BUILD_FOR_GOOGLE3)
 SkottySrc::SkottySrc(Path path)
     : fName(SkOSPath::Basename(path.c_str())) {
 
@@ -1389,6 +1393,7 @@ bool SkottySrc::veto(SinkFlags flags) const {
 
     return !type_ok || flags.approach != SinkFlags::kDirect;
 }
+#endif
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 #if defined(SK_XML)
diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h
index 67128ead06..9a6cb0c6ec 100644
--- a/dm/DMSrcSink.h
+++ b/dm/DMSrcSink.h
@@ -262,6 +262,7 @@ private:
     Path fPath;
 };
 
+#if !defined(SK_BUILD_FOR_GOOGLE3)
 class SkottySrc final : public Src {
 public:
     explicit SkottySrc(Path path);
@@ -279,6 +280,7 @@ private:
     SkISize                            fTileSize = SkISize::MakeEmpty();
     std::unique_ptr<skotty::Animation> fAnimation;
 };
+#endif
 
 #if defined(SK_XML)
 } // namespace DM
-- 
cgit v1.2.3