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/DM.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/DM.cpp')
| -rw-r--r-- | dm/DM.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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) |