Add define of SK_ENABLE_VK_LAYERS to gn build
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2357953002
Review-Url: https://codereview.chromium.org/2357953002
diff --git a/BUILD.gn b/BUILD.gn
index 4e78a1c..dddf118 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -21,6 +21,9 @@
skia_enable_android_framework_defines = false
skia_enable_gpu = true
skia_enable_tools = !is_fuchsia
+
+ # TODO: Vulkan debug layers should be disabled for all client uses of skia as well.
+ skia_enable_vulkan_debug_layers = !is_fuchsia && is_debug
}
# Our tools require static linking (they use non-exported symbols) and GPU support (just lazy).
@@ -328,6 +331,9 @@
public_defines += [ "SK_VULKAN" ]
sources += skia_vk_sources
libs += [ "vulkan" ]
+ if (skia_enable_vulkan_debug_layers) {
+ public_defines += [ "SK_ENABLE_VK_LAYERS" ]
+ }
}
}
diff --git a/infra/bots/recipe_modules/flavor/gn_android_flavor.py b/infra/bots/recipe_modules/flavor/gn_android_flavor.py
index a375f3c..d9a8121 100644
--- a/infra/bots/recipe_modules/flavor/gn_android_flavor.py
+++ b/infra/bots/recipe_modules/flavor/gn_android_flavor.py
@@ -63,6 +63,7 @@
args['is_debug'] = 'false'
if 'Vulkan' in extra_config:
args['ndk_api'] = 24
+ args['skia_enable_vulkan_debug_layers'] = 'false'
if 'FrameworkDefs' in extra_config:
args['skia_enable_android_framework_defines'] = 'true'
diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan.json
index 8e704bf..bbe07cc 100644
--- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan.json
+++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan.json
@@ -134,7 +134,7 @@
"gn",
"gen",
"[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan/Release",
- "--args=is_debug=false ndk=\"[SLAVE_BUILD]/android_ndk_linux\" ndk_api=24 target_cpu=\"arm64\""
+ "--args=is_debug=false ndk=\"[SLAVE_BUILD]/android_ndk_linux\" ndk_api=24 skia_enable_vulkan_debug_layers=false target_cpu=\"arm64\""
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {