Skip to content

Commit

Permalink
Simplify GN for skcms, now that it's mandatory in Skia
Browse files Browse the repository at this point in the history
Change-Id: I39a1affe022eaa75c9bb251800ddc28560b87a95
Reviewed-on: https://chromium-review.googlesource.com/1078940
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Cr-Commit-Position: refs/heads/master@{#563233}
  • Loading branch information
brianosman authored and Commit Bot committed May 31, 2018
1 parent 9fafb29 commit 4a103a4
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions skia/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ config("skia_config") {
config("skia_library_config") {
# These include directories are only included for Skia code and are not
# exported to dependents.
defines = []
include_dirs = [
"//third_party/skia/include/codec",
"//third_party/skia/include/private",
Expand Down Expand Up @@ -146,8 +147,6 @@ config("skia_library_config") {
# TODO: remove after Skia shader relocation (https://skia-review.googlesource.com/c/17927)
include_dirs += [ "//third_party/skia/src/effects/gradients" ]

defines = [ "SK_USE_SKCMS" ]

if (!is_ios && !use_system_freetype) {
defines += [ "SK_FREETYPE_MINIMUM_RUNTIME_VERSION=(((FREETYPE_MAJOR) * 0x01000000) | ((FREETYPE_MINOR) * 0x00010000) | ((FREETYPE_PATCH) * 0x00000100))" ]
}
Expand Down Expand Up @@ -228,12 +227,7 @@ config("skia_library_config") {
}

import("//third_party/skia/third_party/skcms/skcms.gni")
config("skcms_public") {
include_dirs = [ "//third_party/skia/third_party/skcms" ]
}
source_set("skcms") {
public_configs = [ ":skcms_public" ]

cflags = []
if (!is_win || is_clang) {
cflags += [
Expand Down Expand Up @@ -578,7 +572,6 @@ component("skia") {

# skcms
deps += [ ":skcms" ]
sources += [ "//third_party/skia/src/core/SkColorSpaceXform_skcms.cpp" ]
}

# Template for things that are logically part of :skia, but need to be split out
Expand Down

0 comments on commit 4a103a4

Please sign in to comment.