aboutsummaryrefslogtreecommitdiffhomepage
path: root/gn/find_headers.py
Commit message (Collapse)AuthorAge
* Add 'public' headers support to find_headers.pyGravatar Florin Malita2018-05-30
| | | | | | | | | | Update the script to search for headers in both 'sources' and 'public'. Change-Id: I195c6e3720f3d3d99dea04628388821a58fa791b Reviewed-on: https://skia-review.googlesource.com/130823 Reviewed-by: Mike Klein <mtklein@google.com> Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
* Revert "Revert "find_headers.py to better find headers.""Gravatar Ben Wagner2018-05-25
| | | | | | | | | | | | | 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>
* Revert "find_headers.py to better find headers."Gravatar Mike Klein2018-05-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <module> 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 <egdaniel@google.com> > Commit-Queue: Ben Wagner <bungeman@google.com> 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 <mtklein@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
* find_headers.py to better find headers.Gravatar Ben Wagner2018-05-25
| | | | | | | | | | | | | | | 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 <egdaniel@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
* Add Goma support in gn_flavor.Gravatar Ben Wagner2017-12-08
| | | | | | | | | | | | Using full paths in skia.h causes "file not found" with Goma. All other Builds seem fine without the path, so I changed find_headers.py to use the basename. Change-Id: Ib520e91a92ebffe36a736eb53f643d359f5bb2ce Reviewed-on: https://skia-review.googlesource.com/79360 Reviewed-by: Greg Daniel <egdaniel@google.com> Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Ben Wagner <benjaminwagner@google.com>
* Revert "Revert "Update skia to use ifdefs for Vulkan code instead of dummy ↵Gravatar Robert Phillips2017-06-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | header"" This reverts commit fad9e3f54112ea8c8bb6bb72384f47b9759578f5. Reason for revert: Can't find the error message anymore (?!?) Let's try again shall we Original change's description: > Revert "Update skia to use ifdefs for Vulkan code instead of dummy header" > > This reverts commit c0f8e426c59eec6c720b8e1329dcb966cf1b6800. > > Reason for revert: Experiment to see if this will unblock the Android roll > > Original change's description: > > Update skia to use ifdefs for Vulkan code instead of dummy header > > > > Bug: skia:6721 > > Change-Id: I80a4c9f2acc09c174497f625c50ed12a8bb76505 > > Reviewed-on: https://skia-review.googlesource.com/19547 > > Reviewed-by: Mike Klein <mtklein@google.com> > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > TBR=egdaniel@google.com,mtklein@google.com,bsalomon@google.com > > Change-Id: Ib51c1672570f2071a17b6fbde692a5174b0358ce > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:6721 > Reviewed-on: https://skia-review.googlesource.com/19724 > Reviewed-by: Robert Phillips <robertphillips@google.com> > Commit-Queue: Robert Phillips <robertphillips@google.com> TBR=egdaniel@google.com,mtklein@google.com,bsalomon@google.com,robertphillips@google.com Change-Id: Iecef7ddcfe31d82938336120a4193525ac6693be No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:6721 Reviewed-on: https://skia-review.googlesource.com/19782 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
* Revert "Update skia to use ifdefs for Vulkan code instead of dummy header"Gravatar Robert Phillips2017-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c0f8e426c59eec6c720b8e1329dcb966cf1b6800. Reason for revert: Experiment to see if this will unblock the Android roll Original change's description: > Update skia to use ifdefs for Vulkan code instead of dummy header > > Bug: skia:6721 > Change-Id: I80a4c9f2acc09c174497f625c50ed12a8bb76505 > Reviewed-on: https://skia-review.googlesource.com/19547 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Greg Daniel <egdaniel@google.com> TBR=egdaniel@google.com,mtklein@google.com,bsalomon@google.com Change-Id: Ib51c1672570f2071a17b6fbde692a5174b0358ce No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:6721 Reviewed-on: https://skia-review.googlesource.com/19724 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
* Update skia to use ifdefs for Vulkan code instead of dummy headerGravatar Greg Daniel2017-06-13
| | | | | | | | Bug: skia:6721 Change-Id: I80a4c9f2acc09c174497f625c50ed12a8bb76505 Reviewed-on: https://skia-review.googlesource.com/19547 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
* Check-in vulkan.h into third_party and use that instead of local sdk vulkan.hGravatar Greg Daniel2017-04-20
| | | | | | | | | | | | | | | | | | This change is needed since once we start getting support for varrying of extensions and newer version support in general, we need a common vulkan header to compile off of. Otherwise we will run into problems if clients have older headers that don't include functions/symbols we are trying to use. Additionally it has the benefit of not needing to add if SK_VULKAN around code in include which wants to use vulkan symbols. This is a reland of the reverted cl: https://skia-review.googlesource.com/13804 Bug: skia: Change-Id: I9023e80e60d2f2ebbdc8e794ec46d6f5c5c7c917 Reviewed-on: https://skia-review.googlesource.com/13874 Reviewed-by: Derek Sollenberger <djsollen@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
* Revert "Check-in vulkan.h into third_party and use that instead of local sdk ↵Gravatar Greg Daniel2017-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vulkan.h" This reverts commit 3a3bc42b7d5b9d996debab1d2a05d2137c875bd7. Reason for revert: still breaking android Original change's description: > Check-in vulkan.h into third_party and use that instead of local sdk vulkan.h > > This change is needed since once we start getting support for varrying of extensions > and newer version support in general, we need a common vulkan header to compile off of. > Otherwise we will run into problems if clients have older headers that don't include > functions/symbols we are trying to use. > > Additionally it has the benefit of not needing to add if SK_VULKAN around code in > include which wants to use vulkan symbols. > > This is a reupload of CL: https://skia-review.googlesource.com/13651 > > Bug: skia: > Change-Id: I091f526b8c4a61774c34834cd7bfb7e2c822ff5c > Reviewed-on: https://skia-review.googlesource.com/13804 > Reviewed-by: Derek Sollenberger <djsollen@google.com> > Commit-Queue: Greg Daniel <egdaniel@google.com> > TBR=djsollen@google.com,egdaniel@google.com,mtklein@google.com,jvanverth@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: Ic595e32005761170156499cfb6efc1acfce96001 Reviewed-on: https://skia-review.googlesource.com/13806 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
* Check-in vulkan.h into third_party and use that instead of local sdk vulkan.hGravatar Greg Daniel2017-04-19
| | | | | | | | | | | | | | | | | | This change is needed since once we start getting support for varrying of extensions and newer version support in general, we need a common vulkan header to compile off of. Otherwise we will run into problems if clients have older headers that don't include functions/symbols we are trying to use. Additionally it has the benefit of not needing to add if SK_VULKAN around code in include which wants to use vulkan symbols. This is a reupload of CL: https://skia-review.googlesource.com/13651 Bug: skia: Change-Id: I091f526b8c4a61774c34834cd7bfb7e2c822ff5c Reviewed-on: https://skia-review.googlesource.com/13804 Reviewed-by: Derek Sollenberger <djsollen@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
* Revert "Check-in vulkan.h into third_party and use that instead of local sdk ↵Gravatar Greg Daniel2017-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vulkan.h" This reverts commit edbb7d8860a63b1cacb1e89ec205c72a2de7c134. Reason for revert: breaking android Original change's description: > Check-in vulkan.h into third_party and use that instead of local sdk vulkan.h > > This change is needed since once we start getting support for varrying of extensions > and newer version support in general, we need a common vulkan header to compile off of. > Otherwise we will run into problems if clients have older headers that don't include > functions/symbols we are trying to use. > > Additionally it has the benefit of not needing to add if SK_VULKAN around code in > include which wants to use vulkan symbols. > > Bug: skia: > Change-Id: I674a253308596dc75bd23574984ae933923679f9 > Reviewed-on: https://skia-review.googlesource.com/13651 > Commit-Queue: Greg Daniel <egdaniel@google.com> > Reviewed-by: Jim Van Verth <jvanverth@google.com> > Reviewed-by: Mike Klein <mtklein@chromium.org> > TBR=mtklein@chromium.org,egdaniel@google.com,mtklein@google.com,jvanverth@google.com,bsalomon@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I179647e6ae213b1b17a9c42ced5e98c6599b96c2 Reviewed-on: https://skia-review.googlesource.com/13774 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
* Check-in vulkan.h into third_party and use that instead of local sdk vulkan.hGravatar Greg Daniel2017-04-18
| | | | | | | | | | | | | | | | | This change is needed since once we start getting support for varrying of extensions and newer version support in general, we need a common vulkan header to compile off of. Otherwise we will run into problems if clients have older headers that don't include functions/symbols we are trying to use. Additionally it has the benefit of not needing to add if SK_VULKAN around code in include which wants to use vulkan symbols. Bug: skia: Change-Id: I674a253308596dc75bd23574984ae933923679f9 Reviewed-on: https://skia-review.googlesource.com/13651 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org>
* Allow including of vulkan.h as a required public api when using vulkan.Gravatar Greg Daniel2017-04-12
| | | | | | | | Bug: skia: Change-Id: I3ac382edc12144dcda9ef168f752b14878e0e5ac Reviewed-on: https://skia-review.googlesource.com/13262 Commit-Queue: Mike Klein <mtklein@chromium.org> Reviewed-by: Mike Klein <mtklein@chromium.org>
* Mark this file as executableGravatar Adam Barth2016-11-17
| | | | | | | | | | | | The executable bit is needed in the Fuchsia build in order to execute this file during the build. GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4985 Change-Id: I4c11d823d052b7c8cef79b2842169581db76e815 Reviewed-on: https://skia-review.googlesource.com/4985 Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Mike Klein <mtklein@chromium.org>
* Streamline skia.h construction.Gravatar Mike Klein2016-11-03
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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-16 11:33:37 +0000