Skip to content

Commit

Permalink
Make SK_FREETYPE_MINIMUM_RUNTIME_VERSION private.
Browse files Browse the repository at this point in the history
The define SK_FREETYPE_MINIMUM_RUNTIME_VERSION is only used when
building Skia the library -- it does not affect any headers. As a
result, it should only be set when building Skia, it does not need
to be defined when building dependencies.

BUG=chromium:732670

Change-Id: I35eb988fb9e8af395e9f5d8668d7c0b3a5a02db8
Reviewed-on: https://chromium-review.googlesource.com/533573
Reviewed-by: Dominik Röttsches <drott@chromium.org>
Commit-Queue: Ben Wagner <bungeman@google.com>
Cr-Commit-Position: refs/heads/master@{#479178}
  • Loading branch information
bungeman authored and Commit Bot committed Jun 13, 2017
1 parent 7938f5d commit 6d96b82
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions skia/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@ config("skia_config") {
defines += [ "SK_HAS_JPEG_LIBRARY" ]
}

if (!use_system_freetype) {
defines += [ "SK_FREETYPE_MINIMUM_RUNTIME_VERSION=(((FREETYPE_MAJOR) * 0x01000000) | ((FREETYPE_MINOR) * 0x00010000) | ((FREETYPE_PATCH) * 0x00000100))" ]
}

if (is_component_build) {
defines += [
"SKIA_DLL",
Expand Down Expand Up @@ -128,6 +124,10 @@ config("skia_library_config") {

defines = []

if (!use_system_freetype) {
defines += [ "SK_FREETYPE_MINIMUM_RUNTIME_VERSION=(((FREETYPE_MAJOR) * 0x01000000) | ((FREETYPE_MINOR) * 0x00010000) | ((FREETYPE_PATCH) * 0x00000100))" ]
}

if (is_component_build) {
defines += [ "SKIA_IMPLEMENTATION=1" ]
}
Expand Down

0 comments on commit 6d96b82

Please sign in to comment.