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>

1 files changed, 7 insertions, 7 deletions

diff --git a/BUILD.gn b/BUILD.gn
index bb355c67c2..e3f87bce65 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -55,17 +55,14 @@ declare_args() {
   }
 }
 declare_args() {
+  skia_vulkan_headers = ""
   if (skia_use_vulkan) {
+    # When buliding on Android we get the header via the NDK so no need for any extra path.
     if (is_fuchsia) {
       skia_vulkan_headers = "$fuchsia_vulkan_sdk/include"
     } else if (is_linux || is_win) {
       skia_vulkan_headers = "$skia_vulkan_sdk/include"
-    } else {
-      # When buliding on Android we get the header via the NDK
-      skia_vulkan_headers = ""
     }
-  } else {
-    skia_vulkan_headers = "third_party/vulkan"
   }
 }
 
@@ -91,6 +88,10 @@ skia_public_includes = [
   "include/utils/mac",
 ]
 
+if (skia_use_vulkan) {
+  skia_public_includes += [ "include/gpu/vk" ]
+}
+
 # Skia public API, generally provided by :skia.
 config("skia_public") {
   include_dirs = skia_public_includes
@@ -748,8 +749,7 @@ if (skia_enable_tools) {
     skia_h = "$target_gen_dir/skia.h"
     script = "gn/find_headers.py"
     args = [ rebase_path(skia_h, root_build_dir) ] +
-           rebase_path(skia_public_includes) +
-           [ rebase_path("third_party/vulkan") ]
+           rebase_path(skia_public_includes)
     depfile = "$skia_h.deps"
     outputs = [
       skia_h,