Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit dba80be

Browse files
authored
[Impeller] Switched to static linked libc++ in vulkan validation layers. (#48290)
fixes flutter/flutter#138535 test coverage: existing integration tests in flutter repo which look for validation layers I also verified locally that the `libc++.so` is no longer present and that it runs correctly. ``` $ find lib/arm64-v8a/ lib/arm64-v8a/ lib/arm64-v8a//libflutter.so lib/arm64-v8a//libVkLayer_khronos_validation.so ``` [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
1 parent 7cf9d90 commit dba80be

File tree

2 files changed

+4
-8
lines changed
  • build/secondary/third_party/vulkan_validation_layers
  • shell/platform/android

2 files changed

+4
-8
lines changed

build/secondary/third_party/vulkan_validation_layers/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ foreach(layer_info, layers) {
464464
}
465465
if (is_android) {
466466
libs = [
467-
"c++", # Note: C++ added by Flutter.
467+
"c++_static", # Note: C++ added by Flutter.
468468
"log",
469469
"nativewindow",
470470
]

shell/platform/android/BUILD.gn

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -499,13 +499,9 @@ action("android_jar") {
499499
"--native_lib",
500500
rebase_path("$validation_layer_out_dir/libVkLayer_khronos_validation.so"),
501501
]
502-
if (current_cpu == "arm64") {
503-
args += [
504-
"--native_lib",
505-
rebase_path("$android_libcpp_root/libs/arm64-v8a/libc++_shared.so",
506-
root_build_dir),
507-
]
508-
} else {
502+
if (current_cpu != "arm64") {
503+
# This may not be necessarily required anymore. It was kept to maintain
504+
# old behavior.
509505
assert(false, "Validation layers not supported for arch.")
510506
}
511507
}

0 commit comments

Comments
 (0)