diff --git a/BUILD.gn b/BUILD.gn
index 83146bbc58..d59cea6dda 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -775,12 +775,33 @@ 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" ]
+
+  cflags = []
+  if (!is_win || is_clang) {
+    cflags += [
+      "-w",
+      "-std=c11",
+    ]
+  }
+
+  public = [
+    "third_party/skcms/skcms.h",
+  ]
+  sources = rebase_path(skcms_sources, ".", "third_party/skcms")
+}
+
 optional("skcms") {
   enabled = skia_use_skcms
 
   public_defines = [ "SK_USE_SKCMS" ]
   deps = [
-    "third_party/skcms",
+    ":third_party_skcms",
   ]
   sources = [
     "src/core/SkColorSpaceXform_skcms.cpp",
@@ -1421,9 +1442,9 @@ if (skia_enable_tools) {
       ":experimental_svg_model",
       ":flags",
       ":skia",
+      ":third_party_skcms",
       ":tool_utils",
       "//third_party/libpng",
-      "//third_party/skcms",
       "//third_party/zlib",
     ]
     public_deps = [