AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

FreeType configuration in public_defines.

Browse Source 
Any settings in the FreeType build which may modify the public FreeType
headers must be public_defines. Otherwise FreeType may be built one way
and the dependents on this target may be built with what are essentially
different headers.

This fixes the Skia build with built-in FreeType on Windows.

Change-Id: I6b317fbe491dd6fdd135928b6f50436102a1e281
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/537460
Commit-Queue: Herb Derby <herb@google.com>
Auto-Submit: Ben Wagner <bungeman@google.com>
Reviewed-by: Herb Derby <herb@google.com>
This commit is contained in:
Ben Wagner 2022-05-05 13:23:13 -04:00 committed by SkCQ
parent 2008355f1e
commit e3f2cfc2a4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
third_party/freetype2/BUILD.gn vendored
View File

@ -31,12 +31,12 @@ if (skia_use_system_freetype2) {
defines = [ "FT2_BUILD_LIBRARY" ]
if (target_cpu == "wasm") {
defines += [
public_defines += [
"FT_CONFIG_MODULES_H=<include/freetype-no-type1/ftmodule.h>",
"FT_CONFIG_OPTIONS_H=<include/freetype-no-type1/ftoption.h>",
]
} else {
defines += [
public_defines += [
"FT_CONFIG_MODULES_H=<include/freetype-android/ftmodule.h>",
"FT_CONFIG_OPTIONS_H=<include/freetype-android/ftoption.h>",
]
@ -44,7 +44,7 @@ if (skia_use_system_freetype2) {
if (skia_use_freetype_woff2) {
deps += [ "//third_party/brotli" ]
defines += [ "FT_CONFIG_OPTION_USE_BROTLI" ]
public_defines += [ "FT_CONFIG_OPTION_USE_BROTLI" ]
}
sources = [