From 8dc68c67f827b5b98e05946da251d0f2b2c27e98 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Wed, 30 May 2018 12:57:45 -0400 Subject: Make skcms mandatory Change-Id: I6b08cd586d313e3bc41c0da90698fc26ae1a8bb8 Reviewed-on: https://skia-review.googlesource.com/130822 Commit-Queue: Brian Osman Reviewed-by: Mike Klein --- BUILD.gn | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'BUILD.gn') diff --git a/BUILD.gn b/BUILD.gn index 2d90eccf1a..7270fa46c3 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -30,7 +30,6 @@ declare_args() { skia_use_zlib = true skia_use_metal = false skia_use_libheif = is_skia_dev_build - skia_use_skcms = true skia_android_serial = "" skia_enable_discrete_gpu = true @@ -724,12 +723,7 @@ optional("raw") { } import("third_party/skcms/skcms.gni") -config("third_party_skcms_public") { - include_dirs = [ "third_party/skcms" ] -} -source_set("third_party_skcms") { - public_configs = [ ":third_party_skcms_public" ] - +source_set("skcms") { cflags = [] if (!is_win || is_clang) { cflags += [ @@ -744,18 +738,6 @@ source_set("third_party_skcms") { sources = rebase_path(skcms_sources, ".", "third_party/skcms") } -optional("skcms") { - enabled = skia_use_skcms - - public_defines = [ "SK_USE_SKCMS" ] - deps = [ - ":third_party_skcms", - ] - sources = [ - "src/core/SkColorSpaceXform_skcms.cpp", - ] -} - optional("typeface_freetype") { enabled = skia_use_freetype @@ -1406,7 +1388,6 @@ if (skia_enable_tools) { ":experimental_svg_model", ":flags", ":skia", - ":third_party_skcms", ":tool_utils", "modules/sksg:tests", "//third_party/libpng", @@ -1578,7 +1559,6 @@ if (skia_enable_tools) { ":gpu_tool_utils", ":skia", ":tests", - ":third_party_skcms", ":tool_utils", "modules/skottie", "modules/sksg", -- cgit v1.2.3