aboutsummaryrefslogtreecommitdiffhomepage
path: root/gn/find_headers.py
diff options
context:
space:
mode:
authorGravatar Greg Daniel <egdaniel@google.com>2017-04-19 16:39:45 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-04-20 13:09:27 +0000
commitc819e66993f1d66dbbd6c64e70ed897e889e4d32 (patch)
tree93f404ba841a5bed1a5e8a9651007fcadfe3cd42 /gn/find_headers.py
parentd0ce148ed4945aa75fb7eeaaffcfd345dd9f85fb (diff)
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 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>
Diffstat (limited to 'gn/find_headers.py')
-rwxr-xr-xgn/find_headers.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/gn/find_headers.py b/gn/find_headers.py
index f02ebc93ab..8cff31d697 100755
--- a/gn/find_headers.py
+++ b/gn/find_headers.py
@@ -15,8 +15,7 @@ import sys
# very same mechanism Ninja uses to know which .h files affect which .cpp files.
skia_h = sys.argv[1]
-use_vulkan = eval(sys.argv[2])
-include_dirs = sys.argv[3:]
+include_dirs = sys.argv[2:]
blacklist = {
"GrGLConfig_chrome.h",
@@ -27,9 +26,8 @@ headers = []
for directory in include_dirs:
for d, _, files in os.walk(directory):
for f in files:
- if not d.endswith('vk') or use_vulkan:
- if f.endswith('.h') and f not in blacklist:
- headers.append(os.path.join(d,f))
+ if f.endswith('.h') and f not in blacklist:
+ headers.append(os.path.join(d,f))
headers.sort()
with open(skia_h, "w") as f: