diff options
author | Florin Malita <fmalita@chromium.org> | 2018-05-04 12:23:24 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-04 18:36:03 +0000 |
commit | 87ccf33f157ad4a6d83ba079e43192b45d39cb6d (patch) | |
tree | 221e2d4d9fa20b4911d617624950ee1ae3db8633 /dm/DMSrcSink.h | |
parent | b702316d9a92ce2a609d00ed6d882947d6d0cb00 (diff) |
[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>
Diffstat (limited to 'dm/DMSrcSink.h')
-rw-r--r-- | dm/DMSrcSink.h | 2 |
1 files changed, 1 insertions, 1 deletions
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); |