From 2e4c4803693aed50e937a16a3c8488bbc29f68b8 Mon Sep 17 00:00:00 2001 From: Jason Simmons Date: Fri, 22 Mar 2024 19:05:39 +0000 Subject: [PATCH] Use the stripped Vulkan validation library in Android engine builds by default The unstripped build will be used if GN is configured with the --no-stripped flag --- shell/platform/android/BUILD.gn | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/shell/platform/android/BUILD.gn b/shell/platform/android/BUILD.gn index 3025fabbbbbec..32ab06d7a9804 100644 --- a/shell/platform/android/BUILD.gn +++ b/shell/platform/android/BUILD.gn @@ -523,12 +523,19 @@ action("android_jar") { apilevel26_toolchain = "//build/toolchain/android:clang_arm64_apilevel26" validation_layer_target = "//third_party/vulkan_validation_layers($apilevel26_toolchain)" - validation_layer_out_dir = - get_label_info(validation_layer_target, "root_out_dir") deps += [ validation_layer_target ] + if (stripped_symbols) { + validation_library = "lib.stripped/libVkLayer_khronos_validation.so" + } else { + validation_layer_out_dir = + get_label_info(validation_layer_target, "root_out_dir") + validation_library = rebase_path( + "$validation_layer_out_dir/libVkLayer_khronos_validation.so") + } + args += [ "--native_lib", - rebase_path("$validation_layer_out_dir/libVkLayer_khronos_validation.so"), + validation_library, ] if (current_cpu != "arm64") { # This may not be necessarily required anymore. It was kept to maintain