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.cpp | |
| 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.cpp')
| -rw-r--r-- | dm/DMSrcSink.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 <XpsObjectModel.h> #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())) { |