From 87ccf33f157ad4a6d83ba079e43192b45d39cb6d Mon Sep 17 00:00:00 2001 From: Florin Malita 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 Reviewed-by: Mike Klein --- dm/DM.cpp | 2 +- dm/DMSrcSink.cpp | 4 ++-- dm/DMSrcSink.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'dm') 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(FLAGS_skps, "skp"); gather_file_srcs(FLAGS_mskps, "mskp"); -#if !defined(SK_BUILD_FOR_GOOGLE3) +#if defined(SK_ENABLE_SKOTTIE) gather_file_srcs(FLAGS_jsons, "json"); #endif #if defined(SK_XML) diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index e1e411f5ea..5c8ab96806 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -61,7 +61,7 @@ #include #endif -#if !defined(SK_BUILD_FOR_GOOGLE3) +#if defined(SK_ENABLE_SKOTTIE) #include "Skottie.h" #endif @@ -1202,7 +1202,7 @@ Name SKPSrc::name() const { return SkOSPath::Basename(fPath.c_str()); } /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ -#if !defined(SK_BUILD_FOR_GOOGLE3) +#if defined(SK_ENABLE_SKOTTIE) SkottieSrc::SkottieSrc(Path path) : fName(SkOSPath::Basename(path.c_str())) { diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h index d52fe8968c..cffca6e760 100644 --- a/dm/DMSrcSink.h +++ b/dm/DMSrcSink.h @@ -252,7 +252,7 @@ private: }; -#if !defined(SK_BUILD_FOR_GOOGLE3) +#if defined(SK_ENABLE_SKOTTIE) class SkottieSrc final : public Src { public: explicit SkottieSrc(Path path); -- cgit v1.2.3