Revert "Check-in vulkan.h into third_party and use that instead of local sdk 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>

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: