From 02fb7b3ae372866fa4d74512fa774bfa5cf5899f Mon Sep 17 00:00:00 2001 From: Aaron Clarke Date: Tue, 21 Nov 2023 12:57:14 -0800 Subject: [PATCH 1/2] [Impeller] Switched to static linked libc++ in vulkan validation layers. --- .../third_party/vulkan_validation_layers/BUILD.gn | 2 +- shell/platform/android/BUILD.gn | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/build/secondary/third_party/vulkan_validation_layers/BUILD.gn b/build/secondary/third_party/vulkan_validation_layers/BUILD.gn index 688ba45fda98e..243ab0207f1bf 100644 --- a/build/secondary/third_party/vulkan_validation_layers/BUILD.gn +++ b/build/secondary/third_party/vulkan_validation_layers/BUILD.gn @@ -464,7 +464,7 @@ foreach(layer_info, layers) { } if (is_android) { libs = [ - "c++", # Note: C++ added by Flutter. + "c++_static", # Note: C++ added by Flutter. "log", "nativewindow", ] diff --git a/shell/platform/android/BUILD.gn b/shell/platform/android/BUILD.gn index 37615a587ff99..35d76c3884696 100644 --- a/shell/platform/android/BUILD.gn +++ b/shell/platform/android/BUILD.gn @@ -499,13 +499,9 @@ action("android_jar") { "--native_lib", rebase_path("$validation_layer_out_dir/libVkLayer_khronos_validation.so"), ] - if (current_cpu == "arm64") { - args += [ - "--native_lib", - rebase_path("$android_libcpp_root/libs/arm64-v8a/libc++_shared.so", - root_build_dir), - ] - } else { + if (current_cpu != "arm64") { + # This may not be necessarily require anymore. It was kept to maintain old + # behavior. assert(false, "Validation layers not supported for arch.") } } From d47fa99697c524d3e15ed6b054d414d93f7550ff Mon Sep 17 00:00:00 2001 From: Aaron Clarke Date: Tue, 21 Nov 2023 13:09:39 -0800 Subject: [PATCH 2/2] spelling --- shell/platform/android/BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shell/platform/android/BUILD.gn b/shell/platform/android/BUILD.gn index 35d76c3884696..d0b0c48c39b83 100644 --- a/shell/platform/android/BUILD.gn +++ b/shell/platform/android/BUILD.gn @@ -500,8 +500,8 @@ action("android_jar") { rebase_path("$validation_layer_out_dir/libVkLayer_khronos_validation.so"), ] if (current_cpu != "arm64") { - # This may not be necessarily require anymore. It was kept to maintain old - # behavior. + # This may not be necessarily required anymore. It was kept to maintain + # old behavior. assert(false, "Validation layers not supported for arch.") } }