commit 8dc68c67f827b5b98e05946da251d0f2b2c27e98
author Brian Osman <brianosman@google.com> Wed May 30 12:57:45 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed May 30 17:37:49 2018 +0000
tree a5a08ed07409c9e0d951be5f6497338050bae520
parent 588f879677d4f36e16a42dd96876534f104c2e2f

Make skcms mandatory

Change-Id: I6b08cd586d313e3bc41c0da90698fc26ae1a8bb8
Reviewed-on: https://skia-review.googlesource.com/130822
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 2d90ecc..7270fa4 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -30,7 +30,6 @@
   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 @@
 }
 
 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 @@
   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 @@
       ":experimental_svg_model",
       ":flags",
       ":skia",
-      ":third_party_skcms",
       ":tool_utils",
       "modules/sksg:tests",
       "//third_party/libpng",
@@ -1578,7 +1559,6 @@
         ":gpu_tool_utils",
         ":skia",
         ":tests",
-        ":third_party_skcms",
         ":tool_utils",
         "modules/skottie",
         "modules/sksg",