commit 9494f3e154c648e2df329e9974e18df880585311
author Ben Wagner <bungeman@google.com> Fri May 25 15:48:31 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri May 25 21:49:42 2018 +0000
tree e47595cb4d7200f82bd849edd3a4ba1a8fbb92d7
parent 06768ca1ea87c027c7a8752fa6495d3e634d1940

Revert "Revert "find_headers.py to better find headers.""

This reverts commit 59da548b0c4d4239e0ec1855d3f7f77a2bff4b93.

This now provides more information on failure and always sets the
source root for cases where the output directory is not a subdirectory
of the source directory.

Change-Id: I8e317814d4686d9a0736b7097b404920fa55e769
Reviewed-on: https://skia-review.googlesource.com/130134
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 24dc225..7ae0f6d 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1013,7 +1013,9 @@
     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) ] +
+    args = [ rebase_path("//bin/gn") ] +
+           [ rebase_path("//") ] +
+           [ rebase_path(skia_h, root_build_dir) ] +
            rebase_path(skia_public_includes)
     depfile = "$skia_h.deps"
     outputs = [