diff --git a/gn/flutter_defines.gni b/gn/flutter_defines.gni index 91083c760a..e7c32aed38 100644 --- a/gn/flutter_defines.gni +++ b/gn/flutter_defines.gni @@ -7,4 +7,5 @@ flutter_defines = [ "SK_DISABLE_RENDER_TARGET_SORTING", "SK_SUPPORT_LEGACY_VULKAN_INTERFACE", "SK_LEGACY_SKCODEC_NONE_ENUM", + "SK_SUPPORT_LEGACY_TYPEFACE_MAKEFROMSTREAM", ] diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h index 7c2c334a99..7357d03aeb 100644 --- a/include/core/SkTypeface.h +++ b/include/core/SkTypeface.h @@ -33,8 +33,6 @@ typedef uint32_t SkFontID; /** Machine endian. */ typedef uint32_t SkFontTableTag; -#define SK_SUPPORT_LEGACY_TYPEFACE_MAKEFROMSTREAM - /** \class SkTypeface The SkTypeface class specifies the typeface and intrinsic style of a font. diff --git a/public.bzl b/public.bzl index 82502b4a5f..e87b957f8e 100644 --- a/public.bzl +++ b/public.bzl @@ -608,6 +608,8 @@ def base_defines(os_conditions): "SK_JUMPER_DISABLE_8BIT", # JPEG is in codec_limited "SK_HAS_JPEG_LIBRARY", + # remove once we've fixed call-sites + "SK_SUPPORT_LEGACY_TYPEFACE_MAKEFROMSTREAM", ] + skia_select( os_conditions, [