Fix build when (is_ios && !skia_enable_skottie)
Bug: skia:9726
Change-Id: I2ad05e28f8699fc7c5159145cc59065fc8bd5b93
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/265520
Reviewed-by: Hal Canary <halcanary@skia.org>
Commit-Queue: Hal Canary <halcanary@skia.org>
Auto-Submit: Hal Canary <halcanary@google.com>
diff --git a/BUILD.gn b/BUILD.gn
index c44a81e..8ebd593 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -2518,7 +2518,7 @@
}
}
-if (is_ios && !skia_enable_flutter_defines) {
+if (is_ios && skia_enable_skottie && !skia_enable_flutter_defines) {
group("skottie_ios") {
deps = [
"tools/skottie_ios_app",
diff --git a/gn/skia.gni b/gn/skia.gni
index e81309db..1f63505 100644
--- a/gn/skia.gni
+++ b/gn/skia.gni
@@ -20,6 +20,7 @@
skia_enable_fontmgr_win_gdi = is_win
skia_enable_gpu = true
skia_enable_pdf = true
+ skia_enable_skottie = !(is_win && is_component_build)
skia_enable_sksl_interpreter = is_skia_dev_build
skia_enable_skvm_jit =
is_skia_dev_build && ((target_cpu == "x64" && (is_linux || is_mac)) ||
diff --git a/modules/skottie/BUILD.gn b/modules/skottie/BUILD.gn
index 4ed6eef..5bda984 100644
--- a/modules/skottie/BUILD.gn
+++ b/modules/skottie/BUILD.gn
@@ -5,10 +5,6 @@
import("../../gn/skia.gni")
-declare_args() {
- skia_enable_skottie = !(is_win && is_component_build)
-}
-
if (skia_enable_skottie) {
config("public_config") {
defines = [ "SK_ENABLE_SKOTTIE" ]
