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

refactor: remove x11 logic from filenames.gni (#26146)

Browse source
This commit is contained in:
Valentin Hăloiu 2020-10-26 18:28:11 +01:00 • committed by GitHub
parent 93e786d1b5
commit 2d1bbd2e38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
BUILD.gn
View file

@ -507,15 +507,13 @@ source_set("electron_lib") {
"//ui/wm", "//ui/wm",
] ]
if (use_x11) { if (use_x11) {
sources += filenames.lib_sources_linux_x11
deps += [ deps += [
"//ui/gfx/x", "//ui/gfx/x",
"//ui/gtk/x", "//ui/gtk/x",
] ]
} }
configs += [ ":gio_unix" ] configs += [ ":gio_unix" ]
if (use_x11) {
deps += [ "//ui/gfx/x" ]
}
defines += [ defines += [
# Disable warnings for g_settings_list_schemas. # Disable warnings for g_settings_list_schemas.
"GLIB_DISABLE_DEPRECATION_WARNINGS", "GLIB_DISABLE_DEPRECATION_WARNINGS",

30
filenames.gni
View file

@ -1,5 +1,3 @@
import("//build/config/ui.gni")
filenames = { filenames = {
default_app_ts_sources = [ default_app_ts_sources = [
"default_app/default_app.ts", "default_app/default_app.ts",
@ -45,6 +43,19 @@ filenames = {
"shell/common/platform_util_linux.cc", "shell/common/platform_util_linux.cc",
] ]
lib_sources_linux_x11 = [
"chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc",
"chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h",
"shell/browser/ui/views/global_menu_bar_x11.cc",
"shell/browser/ui/views/global_menu_bar_x11.h",
"shell/browser/ui/x/event_disabler.cc",
"shell/browser/ui/x/event_disabler.h",
"shell/browser/ui/x/window_state_watcher.cc",
"shell/browser/ui/x/window_state_watcher.h",
"shell/browser/ui/x/x_window_utils.cc",
"shell/browser/ui/x/x_window_utils.h",
]
lib_sources_posix = [ lib_sources_posix = [
"chromium_src/chrome/browser/process_singleton_posix.cc", "chromium_src/chrome/browser/process_singleton_posix.cc",
"shell/browser/electron_browser_main_parts_posix.cc", "shell/browser/electron_browser_main_parts_posix.cc",
@ -634,21 +645,6 @@ filenames = {
"shell/utility/electron_content_utility_client.h", "shell/utility/electron_content_utility_client.h",
] ]
if (use_x11) {
lib_sources_linux += [
"chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc",
"chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h",
"shell/browser/ui/views/global_menu_bar_x11.cc",
"shell/browser/ui/views/global_menu_bar_x11.h",
"shell/browser/ui/x/event_disabler.cc",
"shell/browser/ui/x/event_disabler.h",
"shell/browser/ui/x/window_state_watcher.cc",
"shell/browser/ui/x/window_state_watcher.h",
"shell/browser/ui/x/x_window_utils.cc",
"shell/browser/ui/x/x_window_utils.h",
]
}
lib_sources_nss = [ lib_sources_nss = [
"chromium_src/chrome/browser/certificate_manager_model.cc", "chromium_src/chrome/browser/certificate_manager_model.cc",
"chromium_src/chrome/browser/certificate_manager_model.h", "chromium_src/chrome/browser/certificate_manager_model.h",