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

switch from BUILD.gn to skcms.gni

This lets us set Chromium-specific defines and cflags directly,
as an alternative to the injected chromium_specific_config_for_skcms.
(We'd rather skcms not have to think about Chromium if possible.)

Change-Id: I9e13df7b5210645b2a77a0f2157b2cbe654f11ea
Reviewed-on: https://chromium-review.googlesource.com/1059450Reviewed-by: default avatarFlorin Malita <fmalita@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Cr-Commit-Position: refs/heads/master@{#559088}
parent 8dd798ef
......@@ -225,6 +225,30 @@ 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 += [
"-w",
"-std=c11",
]
}
defines = [ "SKCMS_LEGACY_POWF" ]
public = [
"//third_party/skia/third_party/skcms/skcms.h",
]
sources =
rebase_path(skcms_sources, ".", "//third_party/skia/third_party/skcms")
}
component("skia") {
deps = []
sources = [
......@@ -553,14 +577,10 @@ component("skia") {
}
# skcms
deps += [ "//third_party/skia/third_party/skcms" ]
deps += [ ":skcms" ]
sources += [ "//third_party/skia/src/core/SkColorSpaceXform_skcms.cpp" ]
}
config("chromium_specific_config_for_skcms") {
defines = [ "SKCMS_LEGACY_POWF" ]
}
# Template for things that are logically part of :skia, but need to be split out
# so custom compile flags can be applied.
#
......
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