Revert "Revert "add flag to soften the blow of removing a legacy api for flutter""
Remember to delete the define from SkTypeface.h
This reverts commit b5f23f398da513132c314efb0d0d14ab82d60ef6.
Bug: skia:
Change-Id: I63b2e395dac3850d352f38fdfee9ad751cdcace9
Reviewed-on: https://skia-review.googlesource.com/152590
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
diff --git a/gn/flutter_defines.gni b/gn/flutter_defines.gni
index 91083c7..e7c32ae 100644
--- a/gn/flutter_defines.gni
+++ b/gn/flutter_defines.gni
@@ -7,4 +7,5 @@
"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 7c2c334..7357d03 100644
--- a/include/core/SkTypeface.h
+++ b/include/core/SkTypeface.h
@@ -33,8 +33,6 @@
/** 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 82502b4..e87b957 100644
--- a/public.bzl
+++ b/public.bzl
@@ -608,6 +608,8 @@
"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,
[