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>
---
 dm/DM.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dm/DM.cpp')

diff --git a/dm/DM.cpp b/dm/DM.cpp
index e134ac561c..34362ef31e 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -790,7 +790,7 @@ static bool gather_srcs() {
 
     gather_file_srcs<SKPSrc>(FLAGS_skps, "skp");
     gather_file_srcs<MSKPSrc>(FLAGS_mskps, "mskp");
-#if !defined(SK_BUILD_FOR_GOOGLE3)
+#if defined(SK_ENABLE_SKOTTIE)
     gather_file_srcs<SkottieSrc>(FLAGS_jsons, "json");
 #endif
 #if defined(SK_XML)
-- 
cgit v1.2.3