1 files changed, 17 insertions, 1 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 13884f2d14..4c79375f27 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -686,7 +686,11 @@ component("skia") {
   }
 }
 
+config("skia.h_config") {
+  include_dirs = [ "$target_gen_dir" ]
+}
 action("skia.h") {
+  public_configs = [ ":skia.h_config" ]
   skia_h = "$target_gen_dir/skia.h"
   script = "gn/find_headers.py"
   args = [ rebase_path(skia_h, root_build_dir) ] +
@@ -701,7 +705,6 @@ if (skia_enable_gpu && target_cpu == "x64") {
   # Our bots only have 64-bit libOSMesa installed.
   # TODO: worth fixing?
   executable("fiddle") {
-    include_dirs = [ "$target_gen_dir" ]
     libs = []
     if (is_linux) {
       libs += [ "OSMesa" ]
@@ -719,6 +722,19 @@ if (skia_enable_gpu && target_cpu == "x64") {
   }
 }
 
+if (is_skia_standalone) {
+  source_set("public_headers_warnings_check") {
+    sources = [
+      "tools/public_headers_warnings_check.cpp",
+    ]
+    configs -= [ "//gn:warnings_except_public_headers" ]
+    deps = [
+      ":skia",
+      ":skia.h",
+    ]
+  }
+}
+
 # Targets guarded by skia_enable_tools may use //third_party freely.
 if (skia_enable_tools) {
   template("test_lib") {