aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Ben Wagner <bungeman@google.com>2018-05-22 15:26:43 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-05-22 19:59:35 +0000
commite87225f12a438c15667d9960ebb8ad9d4252f08b (patch)
treee206f4a826b62d9c20173f2961f06c1e6f50bbf1
parent35e0a1a6908492c754156d1abb785da3a9ce2a6b (diff)
Remove include/gpu/vk from include paths.
The public.bzl doesn't yet support vulkan, Chromium adds this include path but appears to do so for the one header fixed in this CL, and Android seems to be fine with this change. Change-Id: I3869776a7653c420b584129936c302b8c8e9e8fa Reviewed-on: https://skia-review.googlesource.com/129640 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
-rw-r--r--BUILD.gn3
-rw-r--r--include/private/GrVkTypesPriv.h2
2 files changed, 1 insertions, 4 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 4b907e1dd7..b31f3931bb 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -104,9 +104,6 @@ skia_public_includes = [
"include/utils/mac",
]
-if (skia_use_vulkan) {
- skia_public_includes += [ "include/gpu/vk" ]
-}
if (skia_enable_atlas_text) {
skia_public_includes += [ "include/atlastext" ]
}
diff --git a/include/private/GrVkTypesPriv.h b/include/private/GrVkTypesPriv.h
index 20b6953d0d..dfc26c7643 100644
--- a/include/private/GrVkTypesPriv.h
+++ b/include/private/GrVkTypesPriv.h
@@ -8,7 +8,7 @@
#ifndef GrVkTypesPriv_DEFINED
#define GrVkTypesPriv_DEFINED
-#include "GrVkTypes.h"
+#include "vk/GrVkTypes.h"
#include "SkRefCnt.h"
class GrVkImageLayout;