From ef900554cb5e783bff4d7435f285b5062fc15178 Mon Sep 17 00:00:00 2001
From: Jackson Gardner <jacksongardner@google.com>
Date: Tue, 17 Oct 2023 09:24:18 -0700
Subject: [PATCH] Include symbol maps in CanvasKit and Skwasm builds.
 (flutter/engine#46973)

This should help with https://github.com/flutter/flutter/issues/122834

Emitting DWARF data or source maps actually significantly changes the size of the build, since some binaryen optimizations must actually be skipped when producing either of those. So we can emit symbol maps for now, which don't affect the size of the actual wasm output. With these, we can at least manually deobfuscate stack traces.
---
 DEPS                                              | 2 +-
 engine/src/flutter/third_party/canvaskit/BUILD.gn | 3 +++
 engine/src/flutter/web_sdk/BUILD.gn               | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/DEPS b/DEPS
index ce8e34139c..e80ce14754 100644
--- a/DEPS
+++ b/DEPS
@@ -262,7 +262,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '1d2965f9b0f784abea8ddbeb54827afa9ed196b9',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '60415e4cb48742a60ba3859d92bbdcb7d14841b0',
 
    # Fuchsia compatibility
    #
diff --git a/engine/src/flutter/third_party/canvaskit/BUILD.gn b/engine/src/flutter/third_party/canvaskit/BUILD.gn
index 691e09ecbf..125daf0998 100644
--- a/engine/src/flutter/third_party/canvaskit/BUILD.gn
+++ b/engine/src/flutter/third_party/canvaskit/BUILD.gn
@@ -27,6 +27,7 @@ copy("canvaskit_group") {
 
   sources = [
     "$root_out_dir/canvaskit/canvaskit.js",
+    "$root_out_dir/canvaskit/canvaskit.js.symbols",
     "$root_out_dir/canvaskit/canvaskit.wasm",
   ]
   outputs = [ "$root_out_dir/flutter_web_sdk/canvaskit/{{source_file_part}}" ]
@@ -61,6 +62,7 @@ copy("canvaskit_chromium_group") {
 
   sources = [
     "$root_out_dir/canvaskit_chromium/canvaskit.js",
+    "$root_out_dir/canvaskit_chromium/canvaskit.js.symbols",
     "$root_out_dir/canvaskit_chromium/canvaskit.wasm",
   ]
   outputs = [
@@ -97,6 +99,7 @@ copy("skwasm_group") {
 
   sources = [
     "$root_out_dir/skwasm/skwasm.js",
+    "$root_out_dir/skwasm/skwasm.js.symbols",
     "$root_out_dir/skwasm/skwasm.wasm",
     "$root_out_dir/skwasm/skwasm.worker.js",
   ]
diff --git a/engine/src/flutter/web_sdk/BUILD.gn b/engine/src/flutter/web_sdk/BUILD.gn
index 4177d97055..1f3d136d45 100644
--- a/engine/src/flutter/web_sdk/BUILD.gn
+++ b/engine/src/flutter/web_sdk/BUILD.gn
@@ -546,10 +546,13 @@ if (!is_fuchsia) {
     if (is_wasm) {
       sources += [
         "$root_out_dir/flutter_web_sdk/canvaskit/canvaskit.js",
+        "$root_out_dir/flutter_web_sdk/canvaskit/canvaskit.js.symbols",
         "$root_out_dir/flutter_web_sdk/canvaskit/canvaskit.wasm",
         "$root_out_dir/flutter_web_sdk/canvaskit/chromium/canvaskit.js",
+        "$root_out_dir/flutter_web_sdk/canvaskit/chromium/canvaskit.js.symbols",
         "$root_out_dir/flutter_web_sdk/canvaskit/chromium/canvaskit.wasm",
         "$root_out_dir/flutter_web_sdk/canvaskit/skwasm.js",
+        "$root_out_dir/flutter_web_sdk/canvaskit/skwasm.js.symbols",
         "$root_out_dir/flutter_web_sdk/canvaskit/skwasm.wasm",
         "$root_out_dir/flutter_web_sdk/canvaskit/skwasm.worker.js",
       ]