Commit a3f77711 authored by Mike Klein's avatar Mike Klein Committed by Commit Bot

use skcms' BUILD.gn

This will let us keep skcms `gn analyze` compatible more easily.

Change-Id: I8d3f1134945859c112862cf7b6066ca6f2af812c
Reviewed-on: https://chromium-review.googlesource.com/1039845
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: default avatarFlorin Malita <fmalita@chromium.org>
Cr-Commit-Position: refs/heads/master@{#555780}
parent 28029b0d
...@@ -75,9 +75,6 @@ config("skia_config") { ...@@ -75,9 +75,6 @@ config("skia_config") {
] ]
} }
defines += [ "SK_USE_SKCMS" ]
include_dirs += [ "//third_party/skia/third_party/skcms" ]
if (skia_support_gpu) { if (skia_support_gpu) {
include_dirs += [ include_dirs += [
"//third_party/skia/src/gpu", "//third_party/skia/src/gpu",
...@@ -147,7 +144,7 @@ config("skia_library_config") { ...@@ -147,7 +144,7 @@ config("skia_library_config") {
# TODO: remove after Skia shader relocation (https://skia-review.googlesource.com/c/17927) # TODO: remove after Skia shader relocation (https://skia-review.googlesource.com/c/17927)
include_dirs += [ "//third_party/skia/src/effects/gradients" ] include_dirs += [ "//third_party/skia/src/effects/gradients" ]
defines = [] defines = [ "SK_USE_SKCMS" ]
if (!is_ios && !use_system_freetype) { if (!is_ios && !use_system_freetype) {
defines += [ "SK_FREETYPE_MINIMUM_RUNTIME_VERSION=(((FREETYPE_MAJOR) * 0x01000000) | ((FREETYPE_MINOR) * 0x00010000) | ((FREETYPE_PATCH) * 0x00000100))" ] defines += [ "SK_FREETYPE_MINIMUM_RUNTIME_VERSION=(((FREETYPE_MAJOR) * 0x01000000) | ((FREETYPE_MINOR) * 0x00010000) | ((FREETYPE_PATCH) * 0x00000100))" ]
...@@ -348,12 +345,6 @@ component("skia") { ...@@ -348,12 +345,6 @@ component("skia") {
sources += [ "//third_party/skia/src/core/SkUtilsArm.cpp" ] sources += [ "//third_party/skia/src/core/SkUtilsArm.cpp" ]
} }
# skcms
sources += [
"//third_party/skia/src/core/SkColorSpaceXform_skcms.cpp",
"//third_party/skia/third_party/skcms/skcms.c",
]
# GPU # GPU
if (skia_support_gpu) { if (skia_support_gpu) {
sources += skia_gpu_sources sources += skia_gpu_sources
...@@ -560,6 +551,10 @@ component("skia") { ...@@ -560,6 +551,10 @@ component("skia") {
if (is_fuchsia) { if (is_fuchsia) {
deps += [ "//third_party/expat" ] deps += [ "//third_party/expat" ]
} }
# skcms
deps += [ "//third_party/skia/third_party/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 # Template for things that are logically part of :skia, but need to be split out
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment