Reland "simplify disabling effect deserialization"
This reverts commit 34d7a163a4a749d6e91cf768d0f1767e8da6ceb2.
Reason for revert: ok now?
Original change's description:
> Revert "simplify disabling effect deserialization"
>
> This reverts commit 5bbf790b5beeb2ed74f04551502259b54ac5556f.
>
> Reason for revert: flutter GN needs some love
>
> Original change's description:
> > simplify disabling effect deserialization
> >
> > Switch to a simple #define instead of conditional build targets.
> >
> > No one changes skia_enable_effects or skia_enable_effects_imagefilters,
> > so we can merge all that together back into :skia.
> >
> > Change-Id: I2985f95ee89149ddc687dc31f4c6bf35cb3a93c7
> > Reviewed-on: https://skia-review.googlesource.com/c/169220
> > Reviewed-by: Kevin Lubick <kjlubick@google.com>
> > Commit-Queue: Mike Klein <mtklein@google.com>
>
> TBR=mtklein@google.com,kjlubick@google.com
>
> Change-Id: I3b818418d303dbc6d2a926a19df64a68499f0ec3
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://skia-review.googlesource.com/c/169222
> Reviewed-by: Mike Klein <mtklein@google.com>
> Commit-Queue: Mike Klein <mtklein@google.com>
TBR=mtklein@google.com,kjlubick@google.com
Cq-Include-Trybots: skia.primary:Build-Debian9-Clang-arm-Release-Flutter_Android
Change-Id: I534346c3ef3561a871f1af6df976bfee0b48014a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/169640
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
diff --git a/BUILD.gn b/BUILD.gn
index d5dd3ee..e58a6e1 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -42,9 +42,6 @@
skia_enable_ccpr = true
skia_enable_nvpr = !skia_enable_flutter_defines
skia_enable_discrete_gpu = true
- skia_enable_effects = true
- skia_enable_effects_imagefilters = true
- skia_enable_effect_deserialization = !skia_enable_flutter_defines
skia_enable_fontmgr_empty = false
skia_enable_gpu = true
skia_enable_nima = false
@@ -377,38 +374,6 @@
}
}
-optional("effects") {
- enabled = skia_enable_effects
- deps = [
- ":compile_processors",
- ]
- sources = skia_effects_sources
- if (skia_enable_effects_imagefilters) {
- sources += skia_effects_imagefilter_sources_no_global_initialization
- if (!skia_enable_skpicture) {
- sources -= [ "//src/effects/imagefilters/SkPictureImageFilter.cpp" ]
- }
- }
-}
-
-optional("effect_deserialization") {
- enabled = skia_enable_effects && skia_enable_effect_deserialization
-
- sources = [
- "src/ports/SkGlobalInitialization_default.cpp",
- ]
- if (skia_enable_effects_imagefilters) {
- sources += [ "src/ports/SkGlobalInitialization_default_imagefilters.cpp" ]
- } else {
- sources += [ "src/ports/SkGlobalInitialization_none_imagefilters.cpp" ]
- }
-
- sources_when_disabled = [
- "src/ports/SkGlobalInitialization_none.cpp",
- "src/ports/SkGlobalInitialization_none_imagefilters.cpp",
- ]
-}
-
optional("fontmgr_android") {
enabled = fontmgr_android_enabled
@@ -862,7 +827,6 @@
configs += skia_library_configs
public_deps = [
- ":effects",
":gpu",
":pdf",
":skcms",
@@ -872,8 +836,8 @@
":arm64",
":armv7",
":avx",
+ ":compile_processors",
":crc32",
- ":effect_deserialization",
":fontmgr_android",
":fontmgr_custom",
":fontmgr_empty",
@@ -907,6 +871,8 @@
sources += skia_core_sources
sources += skia_utils_sources
sources += skia_xps_sources
+ sources += skia_effects_sources
+ sources += skia_effects_imagefilter_sources
sources += [
"src/android/SkAndroidFrameworkUtils.cpp",
"src/android/SkAnimatedImage.cpp",
@@ -932,6 +898,7 @@
"src/codec/SkWbmpCodec.cpp",
"src/images/SkImageEncoder.cpp",
"src/ports/SkDiscardableMemory_none.cpp",
+ "src/ports/SkGlobalInitialization_default.cpp",
"src/ports/SkImageGenerator_skia.cpp",
"src/ports/SkMemory_malloc.cpp",
"src/ports/SkOSFile_stdio.cpp",
@@ -945,6 +912,7 @@
if (!skia_enable_skpicture) {
defines = [ "SK_DISABLE_SKPICTURE" ]
sources -= skia_skpicture_sources
+ sources -= [ "//src/effects/imagefilters/SkPictureImageFilter.cpp" ]
sources += [ "src/core/SkPicture_none.cpp" ]
}