From 4fa3310887490938d35514522eae09157da88663 Mon Sep 17 00:00:00 2001
From: Keeley Hammond <khammond@slack-corp.com>
Date: Thu, 10 Feb 2022 17:43:14 -0800
Subject: [PATCH] build: add stack_trace.h to main delegate (#32854)

* build: add stack_trace.h to main delegate

* build: trigger circleci

* build: free up a tiny bit more space

* build: disable use_thin_lto

* fixup build/args/all.gn

Co-authored-by: Samuel Attard <sam@electronjs.org>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
---
 .circleci/build_config.yml          | 59 ++++++++++++++---------------
 build/args/all.gn                   |  3 ++
 shell/app/electron_main_delegate.cc |  1 +
 3 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/.circleci/build_config.yml b/.circleci/build_config.yml
index ff88d9a518..17129a4607 100644
--- a/.circleci/build_config.yml
+++ b/.circleci/build_config.yml
@@ -349,10 +349,10 @@ step-get-more-space-on-mac: &step-get-more-space-on-mac
     command: |
       if [ "`uname`" == "Darwin" ]; then
         sudo mkdir -p $TMPDIR/del-target
-        if [ "$TARGET_ARCH" == "arm64" ]; then
-          # Remount the root volume as writable, don't ask questions plz
-          sudo mount -uw /
-        fi
+
+        # Remount the root volume as writable, don't ask questions plz
+        sudo mount -uw /
+
         tmpify() {
           if [ -d "$1" ]; then
             sudo mv "$1" $TMPDIR/del-target/$(echo $1|shasum -a 256|head -n1|cut -d " " -f1)
@@ -394,33 +394,32 @@ step-get-more-space-on-mac: &step-get-more-space-on-mac
         tmpify /usr/local/Homebrew
         sudo rm -rf $TMPDIR/del-target
 
-        if [ "$TARGET_ARCH" == "arm64" ]; then
-          sudo rm -rf "/System/Library/Desktop Pictures"
-          sudo rm -rf /System/Library/Templates/Data
-          sudo rm -rf /System/Library/Speech/Voices
-          sudo rm -rf "/System/Library/Screen Savers"
-          sudo rm -rf /System/Volumes/Data/Library/Developer/CommandLineTools/SDKs
-          sudo rm -rf "/System/Volumes/Data/Library/Application Support/Apple/Photos/Print Products"
-          sudo rm -rf /System/Volumes/Data/Library/Java
-          sudo rm -rf /System/Volumes/Data/Library/Ruby
-          sudo rm -rf /System/Volumes/Data/Library/Printers
-          sudo rm -rf /System/iOSSupport
-          sudo rm -rf /System/Applications/*.app
-          sudo rm -rf /System/Applications/Utilities/*.app
-          sudo rm -rf /System/Library/LinguisticData
-          sudo rm -rf /System/Volumes/Data/private/var/db/dyld/*
-          # sudo rm -rf /System/Library/Fonts/*
-          # sudo rm -rf /System/Library/PreferencePanes
-          sudo rm -rf /System/Library/AssetsV2/*
-          sudo rm -rf /Applications/Safari.app
-          sudo rm -rf ~/project/src/build/linux
-          sudo rm -rf ~/project/src/third_party/catapult/tracing/test_data
-          sudo rm -rf ~/project/src/third_party/angle/third_party/VK-GL-CTS
+        sudo rm -rf "/System/Library/Desktop Pictures"
+        sudo rm -rf /System/Library/Templates/Data
+        sudo rm -rf /System/Library/Speech/Voices
+        sudo rm -rf "/System/Library/Screen Savers"
+        sudo rm -rf /System/Volumes/Data/Library/Developer/CommandLineTools/SDKs
+        sudo rm -rf "/System/Volumes/Data/Library/Application Support/Apple/Photos/Print Products"
+        sudo rm -rf /System/Volumes/Data/Library/Developer/CommandLineTools/SDKs/MacOSX10.15.sdk/
+        sudo rm -rf /System/Volumes/Data/Library/Java
+        sudo rm -rf /System/Volumes/Data/Library/Ruby
+        sudo rm -rf /System/Volumes/Data/Library/Printers
+        sudo rm -rf /System/iOSSupport
+        sudo rm -rf /System/Applications/*.app
+        sudo rm -rf /System/Applications/Utilities/*.app
+        sudo rm -rf /System/Library/LinguisticData
+        sudo rm -rf /System/Volumes/Data/private/var/db/dyld/*
+        # sudo rm -rf /System/Library/Fonts/*
+        # sudo rm -rf /System/Library/PreferencePanes
+        sudo rm -rf /System/Library/AssetsV2/*
+        sudo rm -rf /Applications/Safari.app
+        sudo rm -rf ~/project/src/build/linux
+        sudo rm -rf ~/project/src/third_party/catapult/tracing/test_data
+        sudo rm -rf ~/project/src/third_party/angle/third_party/VK-GL-CTS
 
-          # lipo off some huge binaries arm64 versions to save space
-          strip_arm_deep $(xcode-select -p)/../SharedFrameworks
-          strip_arm_deep /System/Volumes/Data/Library/Developer/CommandLineTools/usr
-        fi
+        # lipo off some huge binaries arm64 versions to save space
+        strip_arm_deep $(xcode-select -p)/../SharedFrameworks
+        strip_arm_deep /System/Volumes/Data/Library/Developer/CommandLineTools/usr
       fi
     background: true
 
diff --git a/build/args/all.gn b/build/args/all.gn
index a346a9b3d4..332a3660fd 100644
--- a/build/args/all.gn
+++ b/build/args/all.gn
@@ -35,6 +35,9 @@ enable_pseudolocales = false
 
 is_cfi = false
 
+# This consumes a bit too much disk space on macOS
+use_thin_lto = false
+
 # Make application name configurable at runtime for cookie crypto
 allow_runtime_configurable_key_storage = true
 
diff --git a/shell/app/electron_main_delegate.cc b/shell/app/electron_main_delegate.cc
index 707e4b9009..caa13d764c 100644
--- a/shell/app/electron_main_delegate.cc
+++ b/shell/app/electron_main_delegate.cc
@@ -11,6 +11,7 @@
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
+#include "base/debug/stack_trace.h"
 #include "base/environment.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"