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

build: move chrome_lib_arc to chromium_src/BUILD.gn (#38764)

Browse source
This commit is contained in:
Keeley Hammond 2023-06-13 13:23:11 -07:00 • committed by GitHub
parent 167c2b250e
commit 9aefe5db33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

27
BUILD.gn
View file

@ -542,7 +542,6 @@ source_set("electron_lib") {
if (is_mac) { if (is_mac) {
deps += [ deps += [
":chrome_lib_arc",
":electron_lib_arc", ":electron_lib_arc",
"//components/remote_cocoa/app_shim", "//components/remote_cocoa/app_shim",
"//components/remote_cocoa/browser", "//components/remote_cocoa/browser",
@ -746,32 +745,6 @@ source_set("electron_lib") {
} }
if (is_mac) { if (is_mac) {
source_set("chrome_lib_arc") {
include_dirs = [ "." ]
sources = [
"//chrome/browser/extensions/global_shortcut_listener_mac.h",
"//chrome/browser/extensions/global_shortcut_listener_mac.mm",
"//chrome/browser/icon_loader_mac.mm",
"//chrome/browser/media/webrtc/system_media_capture_permissions_mac.h",
"//chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm",
"//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.h",
"//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.mm",
"//chrome/browser/media/webrtc/window_icon_util_mac.mm",
"//chrome/browser/platform_util_mac.mm",
"//chrome/browser/process_singleton_mac.mm",
]
deps = [
"//base",
"//skia",
"//third_party/electron_node:node_lib",
"//third_party/webrtc_overrides:webrtc_component",
"//v8",
]
configs += [ "//build/config/compiler:enable_arc" ]
}
source_set("electron_lib_arc") { source_set("electron_lib_arc") {
include_dirs = [ "." ] include_dirs = [ "." ]
sources = [ sources = [

32
chromium_src/BUILD.gn
View file

@ -218,6 +218,10 @@ static_library("chrome") {
public_deps += [ "//chrome/services/util_win:lib" ] public_deps += [ "//chrome/services/util_win:lib" ]
} }
if (is_mac) {
public_deps += [ ":chrome_lib_arc" ]
}
if (enable_widevine) { if (enable_widevine) {
sources += [ sources += [
"//chrome/renderer/media/chrome_key_systems.cc", "//chrome/renderer/media/chrome_key_systems.cc",
@ -331,6 +335,34 @@ static_library("chrome") {
} }
} }
if (is_mac) {
source_set("chrome_lib_arc") {
include_dirs = [ "." ]
sources = [
"//chrome/browser/extensions/global_shortcut_listener_mac.h",
"//chrome/browser/extensions/global_shortcut_listener_mac.mm",
"//chrome/browser/icon_loader_mac.mm",
"//chrome/browser/media/webrtc/system_media_capture_permissions_mac.h",
"//chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm",
"//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.h",
"//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.mm",
"//chrome/browser/media/webrtc/window_icon_util_mac.mm",
"//chrome/browser/platform_util_mac.mm",
"//chrome/browser/process_singleton_mac.mm",
]
deps = [
"//base",
"//skia",
"//third_party/electron_node:node_lib",
"//third_party/webrtc_overrides:webrtc_component",
"//v8",
]
configs += [ "//build/config/compiler:enable_arc" ]
}
}
source_set("plugins") { source_set("plugins") {
sources = [] sources = []
deps = [] deps = []