Add libstdc++.so.6 as data for llvm-symbolizer

Bug: 1168298
Change-Id: I4ddebb5e7e2c21b88b0b98877b1f2e802b58bd63
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2639154Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#845442}

base/BUILD.gn

@@ -2247,16 +2247,8 @@ component("base") {
 
   if (using_sanitizer) {
     data += [ "//tools/valgrind/asan/" ]
-    if (is_win) {
-      data +=
-          [ "//third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer.exe" ]
-    } else {
-      data += [ "//third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer" ]
-    }
-    if (is_linux) {
-      # llvm-symbolizer uses libstdc++ from the clang package.
-      data += [ "//third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6" ]
-    }
+    data_deps +=
+        [ "//build/config/clang:llvm-symbolizer_data($host_toolchain)" ]
   }
 
   configs += [ "//build/config/compiler:wexit_time_destructors" ]

build/config/clang/BUILD.gn

@@ -40,3 +40,15 @@ config("extra_warnings") {
     "-Wtautological-overlap-compare",
   ]
 }
+
+group("llvm-symbolizer_data") {
+  if (is_win) {
+    data = [ "$clang_base_path/bin/llvm-symbolizer.exe" ]
+  } else {
+    data = [ "$clang_base_path/bin/llvm-symbolizer" ]
+  }
+  if (is_linux) {
+    # llvm-symbolizer uses libstdc++ from the clang package.
+    data += [ "$clang_base_path/lib/libstdc++.so.6" ]
+  }
+}

build/config/fuchsia/generate_runner_scripts.gni

@@ -128,7 +128,8 @@ template("fuchsia_package_runner") {
     }
 
     if (test_host_cpu == "x64") {
-      data += [ "//third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer" ]
+      data_deps +=
+          [ "//build/config/clang:llvm-symbolizer_data($host_toolchain)" ]
     }
 
     data += [

third_party/android_platform/development/scripts/BUILD.gn

@@ -7,8 +7,6 @@ import("//build/config/python.gni")
 
 python_library("stack_py") {
   pydeps_file = "stack.pydeps"
-  data = [
-    "stack",
-    "//third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer",
-  ]
+  data = [ "stack" ]
+  data_deps = [ "//build/config/clang:llvm-symbolizer_data($host_toolchain)" ]
 }