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>

1 files changed, 3 insertions, 3 deletions

diff --git a/gn/find_headers.py b/gn/find_headers.py
index 1baca2fab4..8cff31d697 100755
--- a/gn/find_headers.py
+++ b/gn/find_headers.py
@@ -24,10 +24,10 @@ blacklist = {
 
 headers = []
 for directory in include_dirs:
-  for f in os.listdir(directory):
-    if os.path.isfile(os.path.join(directory, f)):
+  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(directory,f))
+        headers.append(os.path.join(d,f))
 headers.sort()
 
 with open(skia_h, "w") as f: