diff options
author | Greg Daniel <egdaniel@google.com> | 2017-04-19 01:22:40 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-19 01:22:52 +0000 |
commit | df07ddd1f05bf8905b9edd41d309badc8f3a131b (patch) | |
tree | fd46d541d4ee28db8b980e97adaeea62e7dbe562 /gn/find_headers.py | |
parent | 7fa5c31c2c9af834bee66d5fcf476e250076c8d6 (diff) |
Revert "Check-in vulkan.h into third_party and use that instead of local sdk 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>
Diffstat (limited to 'gn/find_headers.py')
-rwxr-xr-x | gn/find_headers.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gn/find_headers.py b/gn/find_headers.py index 8cff31d697..f02ebc93ab 100755 --- a/gn/find_headers.py +++ b/gn/find_headers.py @@ -15,7 +15,8 @@ import sys # very same mechanism Ninja uses to know which .h files affect which .cpp files. skia_h = sys.argv[1] -include_dirs = sys.argv[2:] +use_vulkan = eval(sys.argv[2]) +include_dirs = sys.argv[3:] blacklist = { "GrGLConfig_chrome.h", @@ -26,8 +27,9 @@ headers = [] for directory in include_dirs: for d, _, files in os.walk(directory): for f in files: - if f.endswith('.h') and f not in blacklist: - headers.append(os.path.join(d,f)) + if not d.endswith('vk') or use_vulkan: + 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: |