From 59da548b0c4d4239e0ec1855d3f7f77a2bff4b93 Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Fri, 25 May 2018 16:16:21 +0000 Subject: Revert "find_headers.py to better find headers." This reverts commit 6c8ad116d460fe892fff77b8f80e284e3487d59d. Reason for revert: https://chromium-swarm.appspot.com/task?id=3db0ac33aa369910&refresh=10 [981/1474] ACTION //:skia.h(//gn/toolchain:gcc_like) FAILED: gen/skia.h python ../../../gn/find_headers.py /mnt/pd0/s/w/ir/cache/work/skia/bin/gn /mnt/pd0/s/w/ir/cache/work/skia/ gen/skia.h /mnt/pd0/s/w/ir/cache/work/skia/include/android /mnt/pd0/s/w/ir/cache/work/skia/include/c /mnt/pd0/s/w/ir/cache/work/skia/include/codec /mnt/pd0/s/w/ir/cache/work/skia/include/config /mnt/pd0/s/w/ir/cache/work/skia/include/core /mnt/pd0/s/w/ir/cache/work/skia/include/effects /mnt/pd0/s/w/ir/cache/work/skia/include/encode /mnt/pd0/s/w/ir/cache/work/skia/include/gpu /mnt/pd0/s/w/ir/cache/work/skia/include/atlastext /mnt/pd0/s/w/ir/cache/work/skia/include/pathops /mnt/pd0/s/w/ir/cache/work/skia/include/ports /mnt/pd0/s/w/ir/cache/work/skia/include/svg /mnt/pd0/s/w/ir/cache/work/skia/include/utils /mnt/pd0/s/w/ir/cache/work/skia/include/utils/mac /mnt/pd0/s/w/ir/cache/work/skia/include/atlastext Traceback (most recent call last): File "../../../gn/find_headers.py", line 32, in sources_json = json.loads(subprocess.check_output(gn_sources_cmd)) File "/usr/lib/python2.7/json/__init__.py", line 339, in loads return _default_decoder.decode(s) File "/usr/lib/python2.7/json/decoder.py", line 364, in decode obj, end = self.raw_decode(s, idx=_w(s, 0).end()) File "/usr/lib/python2.7/json/decoder.py", line 382, in raw_decode raise ValueError("No JSON object could be decoded") ValueError: No JSON object could be decoded Original change's description: > find_headers.py to better find headers. > > The find_headers.py script claims to "recursively search each include > directory for headers" but the recursive part has been left out. > > This changes find_headers to instead find all the sources which are in > public include directories and list them with the shortest possible > path. This removes the need for a blacklist and also handles includes in > subdirectories of public include directories. > > Change-Id: Ib59256a2059d37d4459686c421923207ac7acf38 > Reviewed-on: https://skia-review.googlesource.com/129660 > Reviewed-by: Greg Daniel > Commit-Queue: Ben Wagner TBR=egdaniel@google.com,mtklein@google.com,bungeman@google.com Change-Id: I5cca85754f1b9fde7771ab0ed1bd8117ee96a970 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/130181 Reviewed-by: Mike Klein Commit-Queue: Mike Klein --- BUILD.gn | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'BUILD.gn') diff --git a/BUILD.gn b/BUILD.gn index dd509c26d9..1f515667e5 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1014,9 +1014,7 @@ if (skia_enable_tools) { public_configs = [ ":skia.h_config" ] skia_h = "$target_gen_dir/skia.h" script = "gn/find_headers.py" - args = [ rebase_path("//bin/gn") ] + - [ rebase_path("//") ] + - [ rebase_path(skia_h, root_build_dir) ] + + args = [ rebase_path(skia_h, root_build_dir) ] + rebase_path(skia_public_includes) depfile = "$skia_h.deps" outputs = [ -- cgit v1.2.3