From 87ccf33f157ad4a6d83ba079e43192b45d39cb6d Mon Sep 17 00:00:00 2001
From: Florin Malita <fmalita@chromium.org>
Date: Fri, 4 May 2018 12:23:24 -0400
Subject: [skottie] Disable on Android Framework builds

Make Skottie truly optional (own flag), and disable in framework builds
(to unblock landing the RapidJson refactoring).

Change-Id: I4611f915e43fe11c1f6754ab4a9f63e45af2f8d3
Reviewed-on: https://skia-review.googlesource.com/125872
Commit-Queue: Florin Malita <fmalita@chromium.org>
Reviewed-by: Mike Klein <mtklein@google.com>
---
 tools/viewer/Viewer.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'tools/viewer')

diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp
index 90c4dfc150..7500f3ff5b 100644
--- a/tools/viewer/Viewer.cpp
+++ b/tools/viewer/Viewer.cpp
@@ -12,7 +12,6 @@
 #include "ImageSlide.h"
 #include "Resources.h"
 #include "SampleSlide.h"
-#include "SkottieSlide.h"
 #include "SKPSlide.h"
 #include "SlideDir.h"
 #include "SvgSlide.h"
@@ -47,6 +46,10 @@
 #include <stdlib.h>
 #include <map>
 
+#if defined(SK_ENABLE_SKOTTIE)
+    #include "SkottieSlide.h"
+#endif
+
 using namespace sk_app;
 
 static std::map<GpuPathRenderers, std::string> gPathRendererNames;
@@ -585,10 +588,12 @@ void Viewer::initSlides() {
             [](const SkString& name, const SkString& path) -> sk_sp<Slide> {
                 return sk_make_sp<ImageSlide>(name, path);}
         },
+#if defined(SK_ENABLE_SKOTTIE)
         { ".json", "skottie-dir", FLAGS_jsons,
             [](const SkString& name, const SkString& path) -> sk_sp<Slide> {
                 return sk_make_sp<SkottieSlide>(name, path);}
         },
+#endif
         { ".svg", "svg-dir", FLAGS_svgs,
             [](const SkString& name, const SkString& path) -> sk_sp<Slide> {
                 return sk_make_sp<SvgSlide>(name, path);}
-- 
cgit v1.2.3