mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Revert "build: remove dead symlink from MAS build (#23831)" (#24146)

Browse source 
This reverts commit 7a216a8fab.
This commit is contained in:
Samuel Attard 2020-06-15 23:42:18 -07:00 • committed by GitHub
parent 7a216a8fab
commit 7bf0af7d96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 19 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

2
shell/app/electron_crash_reporter_client.h
View file

@ -12,7 +12,7 @@
#include "base/macros.h"
#include "base/no_destructor.h"
#include "build/build_config.h"
#include "components/crash/core/app/crash_reporter_client.h" // nogncheck
#include "components/crash/core/app/crash_reporter_client.h"
class ElectronCrashReporterClient : public crash_reporter::CrashReporterClient {
public:

5
shell/app/electron_main_delegate.cc
View file

@ -22,6 +22,7 @@
#include "base/strings/string_split.h"
#include "chrome/common/chrome_paths.h"
#include "components/content_settings/core/common/content_settings_pattern.h"
#include "components/crash/core/app/crashpad.h"
#include "components/crash/core/common/crash_key.h"
#include "components/crash/core/common/crash_keys.h"
#include "content/public/common/content_switches.h"
@ -63,10 +64,6 @@
#include "v8/include/v8.h"
#endif
#if !defined(MAS_BUILD)
#include "components/crash/core/app/crashpad.h" // nogncheck
#endif
namespace electron {
namespace {

5
shell/app/node_main.cc
View file

@ -18,6 +18,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/task/thread_pool/thread_pool_instance.h"
#include "base/threading/thread_task_runner_handle.h"
#include "components/crash/core/app/crashpad.h"
#include "content/public/common/content_switches.h"
#include "electron/electron_version.h"
#include "gin/array_buffer.h"
@ -42,10 +43,6 @@
#include "chrome/child/v8_crashpad_support_win.h"
#endif
#if !defined(MAS_BUILD)
#include "components/crash/core/app/crashpad.h" // nogncheck
#endif
namespace {
// Initialize Node.js cli options to pass to Node.js