commit 124d5afbff0b518ee1b8ffcf80ebcb26bc7d31f5
author Florin Malita <fmalita@chromium.org> Sun Dec 31 17:02:26 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Sun Dec 31 22:20:40 2017 +0000
tree 0472b895b3f715a6e9781570e2681d7042b27b85
parent fc043dcd552d293fc4d0da61562e3a7b755a640a

[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/DMSrcSink.cpp

diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index beb55d9..55b54f5 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 @@
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
+#if !defined(SK_BUILD_FOR_GOOGLE3)
 SkottySrc::SkottySrc(Path path)
     : fName(SkOSPath::Basename(path.c_str())) {
 
@@ -1389,6 +1393,7 @@
 
     return !type_ok || flags.approach != SinkFlags::kDirect;
 }
+#endif
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 #if defined(SK_XML)