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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/skqp/gn_to_bp.py | 1 | ||||
| -rw-r--r-- | tools/viewer/Viewer.cpp | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/tools/skqp/gn_to_bp.py b/tools/skqp/gn_to_bp.py index 06ad02cad7..e645398d82 100644 --- a/tools/skqp/gn_to_bp.py +++ b/tools/skqp/gn_to_bp.py @@ -137,6 +137,7 @@ gn_args = { # enable/disable skia subsystems 'skia_enable_fontmgr_empty': 'true', 'skia_enable_pdf': 'false', + 'skia_enable_skottie': 'false', 'skia_use_expat': 'false', 'skia_use_dng_sdk': 'false', 'skia_use_icu': 'false', 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);} |