aboutsummaryrefslogtreecommitdiffhomepage
path: root/third_party
diff options
context:
space:
mode:
authorGravatar Mike Klein <mtklein@google.com>2018-05-22 12:25:43 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-05-22 12:25:55 +0000
commit2c2a119f945eedaced4bf081347a53f05cf0c39c (patch)
tree9feae854e97f543d42de7c73a7df75f16923a1a9 /third_party
parentedf8449d2c3663350b6b6e30d2fa4c70da02deef (diff)
Revert "Move gn setup for vulkan library/headers into their own third_party directory."
This reverts commit 477094250cd55a38d4d796ab6c50eb57bdba65e1. Reason for revert: I think we know this broke the MoltenVK bots. It also appears to have broken the Fuchsia roll: https://logs.chromium.org/v/?s=fuchsia%2Fbuildbucket%2Fcr-buildbucket.appspot.com%2F8945885190914943680%2F%2B%2Fsteps%2Fbuild%2F0%2Fsteps%2Fbuild_fuchsia%2F0%2Fsteps%2Fgn_gen%2F0%2Fstdout Original change's description: > Move gn setup for vulkan library/headers into their own third_party directory. > > Bug: skia: > Change-Id: I4605f0d962271efb77bf3c17f1b0daaaddfb51c8 > Reviewed-on: https://skia-review.googlesource.com/128540 > Commit-Queue: Greg Daniel <egdaniel@google.com> > Reviewed-by: Mike Klein <mtklein@google.com> > Reviewed-by: Ben Wagner <bungeman@google.com> TBR=egdaniel@google.com,mtklein@google.com,bungeman@google.com Change-Id: I6e41d98e39883eff34424a2f352b0c8adec178db No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/129444 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
Diffstat (limited to 'third_party')
-rw-r--r--third_party/vulkan/BUILD.gn65
1 files changed, 0 insertions, 65 deletions
diff --git a/third_party/vulkan/BUILD.gn b/third_party/vulkan/BUILD.gn
deleted file mode 100644
index 8fbf555bb5..0000000000
--- a/third_party/vulkan/BUILD.gn
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2018 Google Inc.
-#
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-declare_args() {
- skia_vulkan_header = ""
- skia_tools_vulkan_header_dir = ""
-
- # When buliding on Android we get the header via the NDK so no need for any extra path.
- if (is_fuchsia) {
- skia_tools_vulkan_header_dir = "$fuchsia_vulkan_sdk/include"
- } else if (is_linux || is_win) {
- skia_tools_vulkan_header_dir = "$skia_vulkan_sdk/include"
- }
-}
-
-config("moltenvk") {
- if (is_ios) {
- moltenvk_framework_path = "$skia_moltenvk_path/MoltenVK/iOS"
- } else {
- moltenvk_framework_path = "$skia_moltenvk_path/MoltenVK/macOS"
- }
- cflags = [
- "-F$moltenvk_framework_path",
- "-isystem$skia_moltenvk_path/MoltenVK/include", # for <vulkan/vulkan.h>
- ]
- ldflags = [ "-F$moltenvk_framework_path" ]
- libs = [
- "MoltenVK.framework",
- "Metal.framework",
- "IOSurface.framework",
- "QuartzCore.framework",
- "Foundation.framework",
- ]
- if (is_ios) {
- libs += [ "UIKit.framework" ]
- } else {
- libs += [ "IOKit.framework" ]
- }
- defines = [ "SK_MOLTENVK" ]
-}
-
-config("vulkan_config") {
- include_dirs = []
- if (skia_tools_vulkan_header_dir != "") {
- include_dirs += [ skia_tools_vulkan_header_dir ]
- }
- defines = [ "SK_VULKAN" ]
- if (skia_vulkan_header != "") {
- defines += [ "SK_VULKAN_HEADER=\"$skia_vulkan_header\"" ]
- } else if (skia_moltenvk_path != "") {
- defines += [ "SK_VULKAN_HEADER=<MoltenVK/mvk_vulkan.h>" ]
- } else if (defined(is_skia_standalone) && is_skia_standalone &&
- !is_official_build) {
- defines += [ "SK_VULKAN_HEADER=\"GrVulkanDefines.h\"" ]
- }
- if (skia_moltenvk_path != "") {
- public_configs += [ ":moltenvk" ]
- }
-}
-
-source_set("vulkan") {
- public_configs = [ ":vulkan_config" ]
-}