aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Forrest Reiling <freiling@google.com>2017-04-17 13:36:39 -0700
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-04-17 23:31:33 +0000
commit30229ac6282981c28ced8f513c8d09684d9d0581 (patch)
treef817d04ac05448191faa5a9b7c8c7ebead71c648
parent775663f2d2da3990a7d78c208fe5bb4c8fac7fc2 (diff)
Fix Fuchsia Vulkan build control
Our last patch here ran into some problems because some people build a subset of fuchsia that does not include skia, so setting skia_use_vulkan breaks their build. This relies on buildargs set from a fuchsia global GNI file to allow us to set them independently of skia in our build system Change-Id: I64f5f0f349c12947c8aff7761dc5fafdb6a91b6c Reviewed-on: https://skia-review.googlesource.com/13617 Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Greg Daniel <egdaniel@google.com> Commit-Queue: Mike Klein <mtklein@chromium.org>
-rw-r--r--BUILD.gn8
1 files changed, 8 insertions, 0 deletions
diff --git a/BUILD.gn b/BUILD.gn
index f700ac6f70..85ae068b61 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -6,6 +6,10 @@
import("gn/android_framework_defines.gni")
import("gn/shared_sources.gni")
+if (is_fuchsia) {
+ import("//build/vulkan/config.gni")
+}
+
if (!defined(is_skia_standalone)) {
is_skia_standalone = false
}
@@ -45,11 +49,15 @@ declare_args() {
if (is_android) {
skia_use_vulkan = defined(ndk_api) && ndk_api >= 24
+ } else if (is_fuchsia) {
+ skia_use_vulkan = fuchsia_use_vulkan
} else {
skia_use_vulkan = skia_vulkan_sdk != ""
}
if (is_win) {
skia_vulkan_headers_path = "$skia_vulkan_sdk/Include"
+ } else if (is_fuchsia) {
+ skia_vulkan_headers_path = "$fuchsia_vulkan_sdk/include"
} else {
skia_vulkan_headers_path = "$skia_vulkan_sdk/include"
}