Streamline skia.h construction.
This moves the work of finding headers from `gn gen` time into the action itself. We can do this safely now because we're constructing a skia.h.d deps file, which Ninja uses to track if-these-are-dirty-then-this-is-dirty relationships. Everything can now live in one handy find_headers.py.
Upshot is, `gn gen` runs ~50ms faster, and I think the code's clearer this way too.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4065
Change-Id: I2f1e7adf68be8e961eb77596786a795134bbb9a6
Reviewed-on: https://skia-review.googlesource.com/4065
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
diff --git a/BUILD.gn b/BUILD.gn
index f25cd73..40f7729 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -667,26 +667,14 @@
}
}
-skia_h_headers = exec_script("gyp/find.py",
- [ "*.h" ] + rebase_path(skia_public_includes),
- "list lines",
- []) -
- [
- rebase_path("include/gpu/gl/GrGLConfig_chrome.h"),
- rebase_path("include/gpu/vk/GrVkBackendContext.h"),
- rebase_path("include/gpu/vk/GrVkDefines.h"),
- rebase_path("include/gpu/vk/GrVkInterface.h"),
- rebase_path("include/gpu/vk/GrVkTypes.h"),
- rebase_path("include/ports/SkFontMgr_fontconfig.h"),
- ]
-
action("skia.h") {
- script = "gn/echo_headers.py"
- args = [ rebase_path("$target_gen_dir/skia.h", root_build_dir) ] +
- rebase_path(skia_h_headers, target_gen_dir)
- inputs = skia_h_headers
+ skia_h = "$target_gen_dir/skia.h"
+ script = "gn/find_headers.py"
+ args = [ rebase_path(skia_h, root_build_dir) ] +
+ rebase_path(skia_public_includes)
+ depfile = "$skia_h.deps"
outputs = [
- "$target_gen_dir/skia.h",
+ skia_h,
]
}