[CP] [Impeller] Switched to static linked libc++ in vulkan validation layers. (#794)

zanderso · web-flow · commit f27d99b4428d · 2023-11-29T17:52:13.000Z
CP of flutter/engine#47886 and the buildroot part of flutter/engine#48290
diff --git a/build/secondary/third_party/libcxxabi/BUILD.gn b/build/secondary/third_party/libcxxabi/BUILD.gn
@@ -79,4 +79,8 @@ source_set("libcxxabi") {
   if (!(is_tsan && is_linux)) {
     sources += [ "src/cxa_guard.cpp" ]
   }
+
+  if (is_fuchsia || (is_posix && !is_apple)) {
+    sources += [ "src/cxa_thread_atexit.cpp" ]
+  }
 }
diff --git a/build/secondary/third_party/vulkan_validation_layers/BUILD.gn b/build/secondary/third_party/vulkan_validation_layers/BUILD.gn
@@ -463,7 +463,7 @@ foreach(layer_info, layers) {
     }
     if (is_android) {
       libs = [
-        "c++", # Note: C++ added by Flutter.
+        "c++_static", # Note: C++ added by Flutter.
         "log",
         "nativewindow",
       ]

Original file line number	Diff line number	Diff line change
`@@ -79,4 +79,8 @@ source_set("libcxxabi") {`
`79`	`79`	`if (!(is_tsan && is_linux)) {`
`80`	`80`	`sources += [ "src/cxa_guard.cpp" ]`
`81`	`81`	`}`
	`82`	`+`
	`83`	`+ if (is_fuchsia \|\| (is_posix && !is_apple)) {`
	`84`	`+ sources += [ "src/cxa_thread_atexit.cpp" ]`
	`85`	`+ }`
`82`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -463,7 +463,7 @@ foreach(layer_info, layers) {`
`463`	`463`	`}`
`464`	`464`	`if (is_android) {`
`465`	`465`	`libs = [`
`466`		`- "c++", # Note: C++ added by Flutter.`
	`466`	`+ "c++_static", # Note: C++ added by Flutter.`
`467`	`467`	`"log",`
`468`	`468`	`"nativewindow",`
`469`	`469`	`]`