diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-10-27 13:31:37 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-27 17:56:24 +0000 |
| commit | 23d73ea5b45cef6cf66ebe912725c4dd947c4767 (patch) | |
| tree | 98072cf4c8534c30423d2852a2eebf922a43119c | |
| parent | cad6416ccbf103648874b0f5fb615ec5ac798f14 (diff) | |
Restore the ability to not build vulkan when VULKAN_SDK is set
After https://skia.googlesource.com/skia/+/686bb21f3ed19218a85e94798fe50e240e3fac08 skia_use_vulkan=false stopped working when VULKAN_SDK is set in the environment.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4038
Change-Id: I3707c930d041556d1727f43c48eba2cad73349eb
Reviewed-on: https://skia-review.googlesource.com/4038
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
| -rw-r--r-- | BUILD.gn | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -21,7 +21,6 @@ declare_args() { skia_use_libwebp = !is_fuchsia skia_use_mesa = false skia_use_sfntly = !is_fuchsia && !is_win # TODO: icu on Windows, re-enable this. - skia_use_vulkan = is_android && defined(ndk_api) && ndk_api >= 24 skia_use_zlib = true skia_enable_android_framework_defines = false @@ -31,7 +30,10 @@ declare_args() { skia_vulkan_sdk = getenv("VULKAN_SDK") } -skia_use_vulkan = skia_use_vulkan || skia_vulkan_sdk != "" +declare_args() { + skia_use_vulkan = + skia_vulkan_sdk != "" || (is_android && defined(ndk_api) && ndk_api >= 24) +} # Our tools require static linking (they use non-exported symbols). skia_enable_tools = skia_enable_tools && !is_component_build |