Skip to content

Commit 7bf0af7

Browse files
MarshallOfSoundMarshallOfSound
authored
Revert "build: remove dead symlink from MAS build (electron#23831)" (electron#24146)
This reverts commit 7a216a8.
1 parent 7a216a8 commit 7bf0af7

10 files changed

+19
-93
lines changed

‎.circleci/config.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,6 @@ step-electron-build: &step-electron-build
418418
fi
419419
cd src
420420
ninja -C out/Default electron -j $NUMBER_OF_NINJA_PROCESSES
421-
node electron/script/check-symlinks.js
422421
423422
step-native-unittests-build: &step-native-unittests-build
424423
run:
@@ -831,7 +830,7 @@ step-restore-out-cache: &step-restore-out-cache
831830
paths:
832831
- ./src/out/Default
833832
keys:
834-
- v8-out-cache-{{ checksum "src/electron/.depshash" }}-{{ checksum "src/electron/.depshash-target" }}
833+
- v7-out-cache-{{ checksum "src/electron/.depshash" }}-{{ checksum "src/electron/.depshash-target" }}
835834
name: Restoring out cache
836835

837836
step-set-git-cache-path: &step-set-git-cache-path
@@ -855,7 +854,7 @@ step-save-out-cache: &step-save-out-cache
855854
save_cache:
856855
paths:
857856
- ./src/out/Default
858-
key: v8-out-cache-{{ checksum "src/electron/.depshash" }}-{{ checksum "src/electron/.depshash-target" }}
857+
key: v7-out-cache-{{ checksum "src/electron/.depshash" }}-{{ checksum "src/electron/.depshash-target" }}
859858
name: Persisting out cache
860859

861860
step-run-electron-only-hooks: &step-run-electron-only-hooks

‎BUILD.gn

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ source_set("electron_lib") {
326326
"//chrome/app/resources:platform_locale_settings",
327327
"//chrome/services/printing/public/mojom",
328328
"//components/certificate_transparency",
329+
"//components/crash/core/app",
329330
"//components/language/core/browser",
330331
"//components/net_log",
331332
"//components/network_hints/browser",
@@ -433,9 +434,6 @@ source_set("electron_lib") {
433434
"*\bviews/*",
434435
]
435436
}
436-
if (!is_mas_build) {
437-
deps += [ "//components/crash/core/app" ]
438-
}
439437

440438
set_sources_assignment_filter(
441439
sources_assignment_filter + extra_source_filters)
@@ -461,13 +459,10 @@ source_set("electron_lib") {
461459
deps += [
462460
"//components/remote_cocoa/app_shim",
463461
"//content/common:mac_helpers",
462+
"//third_party/crashpad/crashpad/client",
464463
"//ui/accelerated_widget_mac",
465464
]
466465

467-
if (!is_mas_build) {
468-
deps += [ "//third_party/crashpad/crashpad/client" ]
469-
}
470-
471466
libs = [
472467
"AVFoundation.framework",
473468
"Carbon.framework",
@@ -778,10 +773,8 @@ if (is_mac) {
778773
framework_contents = [
779774
"Resources",
780775
"Libraries",
776+
"Helpers",
781777
]
782-
if (!is_mas_build) {
783-
framework_contents += [ "Helpers" ]
784-
}
785778
public_deps = [
786779
":electron_framework_libraries",
787780
":electron_lib",
@@ -1012,16 +1005,13 @@ if (is_mac) {
10121005

10131006
group("electron_symbols") {
10141007
deps = [
1008+
":crashpad_handler_syms",
10151009
":electron_app_syms",
10161010
":electron_framework_syms",
10171011
":swiftshader_egl_syms",
10181012
":swiftshader_gles_syms",
10191013
]
10201014

1021-
if (!is_mas_build) {
1022-
deps += [ ":crashpad_handler_syms" ]
1023-
}
1024-
10251015
foreach(helper_params, content_mac_helpers) {
10261016
_helper_target = helper_params[0]
10271017
deps += [ ":electron_helper_syms_${_helper_target}" ]

‎script/check-symlinks.js

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎script/zip_manifests/dist_zip.mac_mas.x64.manifest

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ Electron.app/Contents/
33
Electron.app/Contents/Frameworks/
44
Electron.app/Contents/Frameworks/Electron Framework.framework/
55
Electron.app/Contents/Frameworks/Electron Framework.framework/Electron Framework
6+
Electron.app/Contents/Frameworks/Electron Framework.framework/Helpers
67
Electron.app/Contents/Frameworks/Electron Framework.framework/Libraries
78
Electron.app/Contents/Frameworks/Electron Framework.framework/Resources
89
Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/

‎shell/app/electron_crash_reporter_client.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "base/macros.h"
1313
#include "base/no_destructor.h"
1414
#include "build/build_config.h"
15-
#include "components/crash/core/app/crash_reporter_client.h" // nogncheck
15+
#include "components/crash/core/app/crash_reporter_client.h"
1616

1717
class ElectronCrashReporterClient : public crash_reporter::CrashReporterClient {
1818
public:

‎shell/app/electron_main_delegate.cc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "base/strings/string_split.h"
2323
#include "chrome/common/chrome_paths.h"
2424
#include "components/content_settings/core/common/content_settings_pattern.h"
25+
#include "components/crash/core/app/crashpad.h"
2526
#include "components/crash/core/common/crash_key.h"
2627
#include "components/crash/core/common/crash_keys.h"
2728
#include "content/public/common/content_switches.h"
@@ -63,10 +64,6 @@
6364
#include "v8/include/v8.h"
6465
#endif
6566

66-
#if !defined(MAS_BUILD)
67-
#include "components/crash/core/app/crashpad.h" // nogncheck
68-
#endif
69-
7067
namespace electron {
7168

7269
namespace {

‎shell/app/node_main.cc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "base/strings/utf_string_conversions.h"
1919
#include "base/task/thread_pool/thread_pool_instance.h"
2020
#include "base/threading/thread_task_runner_handle.h"
21+
#include "components/crash/core/app/crashpad.h"
2122
#include "content/public/common/content_switches.h"
2223
#include "electron/electron_version.h"
2324
#include "gin/array_buffer.h"
@@ -42,10 +43,6 @@
4243
#include "chrome/child/v8_crashpad_support_win.h"
4344
#endif
4445

45-
#if !defined(MAS_BUILD)
46-
#include "components/crash/core/app/crashpad.h" // nogncheck
47-
#endif
48-
4946
namespace {
5047

5148
// Initialize Node.js cli options to pass to Node.js

‎shell/browser/api/electron_api_crash_reporter.cc

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,25 @@
1616
#include "base/path_service.h"
1717
#include "base/strings/utf_string_conversions.h"
1818
#include "base/threading/thread_restrictions.h"
19+
#include "chrome/browser/crash_upload_list/crash_upload_list_crashpad.h"
1920
#include "chrome/common/chrome_paths.h"
21+
#include "components/crash/core/app/crashpad.h"
22+
#include "components/crash/core/common/crash_key.h"
2023
#include "components/upload_list/crash_upload_list.h"
2124
#include "components/upload_list/text_log_upload_list.h"
2225
#include "content/public/common/content_switches.h"
2326
#include "gin/arguments.h"
2427
#include "gin/data_object_builder.h"
2528
#include "services/service_manager/embedder/switches.h"
29+
#include "shell/app/electron_crash_reporter_client.h"
30+
#include "shell/common/crash_keys.h"
2631
#include "shell/common/electron_paths.h"
2732
#include "shell/common/gin_converters/callback_converter.h"
2833
#include "shell/common/gin_converters/file_path_converter.h"
2934
#include "shell/common/gin_converters/time_converter.h"
3035
#include "shell/common/gin_helper/dictionary.h"
3136
#include "shell/common/node_includes.h"
32-
33-
#if !defined(MAS_BUILD)
34-
#include "chrome/browser/crash_upload_list/crash_upload_list_crashpad.h"
35-
#include "components/crash/core/app/crashpad.h" // nogncheck
36-
#include "components/crash/core/common/crash_key.h"
37-
#include "shell/app/electron_crash_reporter_client.h"
38-
#include "shell/common/crash_keys.h"
39-
#include "third_party/crashpad/crashpad/client/crashpad_info.h" // nogncheck
40-
#endif
37+
#include "third_party/crashpad/crashpad/client/crashpad_info.h"
4138

4239
#if defined(OS_LINUX)
4340
#include "components/crash/core/app/breakpad_linux.h"
@@ -65,14 +62,6 @@ namespace api {
6562

6663
namespace crash_reporter {
6764

68-
#if defined(MAS_BUILD)
69-
namespace {
70-
71-
void NoOp() {}
72-
73-
} // namespace
74-
#endif
75-
7665
bool IsCrashReporterEnabled() {
7766
return g_crash_reporter_initialized;
7867
}
@@ -214,13 +203,8 @@ void Initialize(v8::Local<v8::Object> exports,
214203
void* priv) {
215204
gin_helper::Dictionary dict(context->GetIsolate(), exports);
216205
dict.SetMethod("start", &electron::api::crash_reporter::Start);
217-
#if defined(MAS_BUILD)
218-
dict.SetMethod("addExtraParameter", &electron::api::crash_reporter::NoOp);
219-
dict.SetMethod("removeExtraParameter", &electron::api::crash_reporter::NoOp);
220-
#else
221206
dict.SetMethod("addExtraParameter", &electron::crash_keys::SetCrashKey);
222207
dict.SetMethod("removeExtraParameter", &electron::crash_keys::ClearCrashKey);
223-
#endif
224208
dict.SetMethod("getParameters", &GetParameters);
225209
dict.SetMethod("getUploadedReports", &GetUploadedReports);
226210
dict.SetMethod("setUploadToServer", &SetUploadToServer);

‎shell/browser/electron_browser_client.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,8 @@
173173
#include "base/debug/leak_annotations.h"
174174
#include "components/crash/content/browser/crash_handler_host_linux.h"
175175
#include "components/crash/core/app/breakpad_linux.h"
176-
#include "components/crash/core/app/crash_switches.h" // nogncheck
177-
#include "components/crash/core/app/crashpad.h" // nogncheck
176+
#include "components/crash/core/app/crash_switches.h"
177+
#include "components/crash/core/app/crashpad.h"
178178
#endif
179179

180180
using content::BrowserThread;

‎shell/common/crash_keys.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "content/public/common/content_switches.h"
1717
#include "shell/common/electron_constants.h"
1818
#include "shell/common/options_switches.h"
19-
#include "third_party/crashpad/crashpad/client/annotation.h" // nogncheck
19+
#include "third_party/crashpad/crashpad/client/annotation.h"
2020

2121
namespace electron {
2222

0 commit comments

Comments
 (0)