Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2321)

Unified Diff: chrome/BUILD.gn

Issue 2774453002: Remove enbale_xpc_notifications compile flag (Closed)
Patch Set: rebase Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « BUILD.gn ('k') | chrome/browser/notifications/notification_platform_bridge_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/BUILD.gn
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index fad74112a6ed49e113df943f5030a4b3747e8fed..3dd815078c4724a11c78231de70c9876c3584244 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -487,20 +487,18 @@ if (is_win) {
}
}
- if (enable_xpc_notifications) {
- bundle_data("chrome_framework_services") {
- sources = [
- "$root_out_dir/AlertNotificationService.xpc",
- ]
+ bundle_data("chrome_framework_services") {
+ sources = [
+ "$root_out_dir/AlertNotificationService.xpc",
+ ]
- outputs = [
- "{{bundle_root_dir}}/XPCServices/{{source_file_part}}",
- ]
+ outputs = [
+ "{{bundle_root_dir}}/XPCServices/{{source_file_part}}",
+ ]
- public_deps = [
- "//chrome/browser/ui/cocoa/notifications:alert_notification_xpc_service",
- ]
- }
+ public_deps = [
+ "//chrome/browser/ui/cocoa/notifications:alert_notification_xpc_service",
+ ]
}
tweak_info_plist("chrome_app_plist") {
@@ -1103,6 +1101,7 @@ if (is_win) {
framework_contents = [
"Helpers",
"Resources",
+ "XPCServices",
]
if (is_chrome_branded) {
@@ -1117,9 +1116,6 @@ if (is_win) {
if (_should_bundle_widevine) {
framework_contents += [ "Libraries" ]
}
- if (enable_xpc_notifications) {
- framework_contents += [ "XPCServices" ]
- }
}
configs += [ "//build/config/compiler:wexit_time_destructors" ]
@@ -1138,6 +1134,7 @@ if (is_win) {
":chrome_framework_helpers",
":chrome_framework_plugins",
":chrome_framework_resources",
+ ":chrome_framework_services",
":packed_resources",
":widevine_cdm_library",
"//build/config/sanitizers:deps",
@@ -1148,10 +1145,6 @@ if (is_win) {
deps += [ ":default_apps" ]
}
- if (enable_xpc_notifications) {
- deps += [ ":chrome_framework_services" ]
- }
-
ldflags = [
"-Wl,-install_name,@executable_path/../Versions/$chrome_version_full/$chrome_framework_name.framework/$chrome_framework_name",
"-compatibility_version",
@@ -1227,15 +1220,12 @@ if (is_win) {
# the list of _dsyms in :chrome_dsym_archive.
_chrome_symbols_sources = [
_framework_binary_path,
+ "$root_out_dir/AlertNotificationService.xpc/Contents/MacOS/AlertNotificationService",
"$root_out_dir/$chrome_helper_name.app/Contents/MacOS/$chrome_helper_name",
"$root_out_dir/$chrome_product_full_name.app/Contents/MacOS/$chrome_product_full_name",
"$root_out_dir/crashpad_handler",
]
- if (enable_xpc_notifications) {
- _chrome_symbols_sources += [ "$root_out_dir/AlertNotificationService.xpc/Contents/MacOS/AlertNotificationService" ]
- }
-
# It is possible to run dump_syms on unstripped products without dSYMs,
# but doing so isn't logical and won't happen in practice.
action_foreach("chrome_dump_syms") {
@@ -1262,12 +1252,9 @@ if (is_win) {
":chrome_framework",
":chrome_helper_app",
"//breakpad:dump_syms",
+ "//chrome/browser/ui/cocoa/notifications:alert_notification_xpc_service",
"//third_party/crashpad/crashpad/handler:crashpad_handler",
]
-
- if (enable_xpc_notifications) {
- deps += [ "//chrome/browser/ui/cocoa/notifications:alert_notification_xpc_service" ]
- }
}
action("chrome_dsym_archive") {
@@ -1278,16 +1265,13 @@ if (is_win) {
# directory it cannot be listed as a source file). The targets that
# generate both the dSYM and binary image are listed in deps.
_dsyms = [
+ "$root_out_dir/AlertNotificationService.dSYM",
"$root_out_dir/$chrome_framework_name.dSYM",
"$root_out_dir/$chrome_helper_name.dSYM",
"$root_out_dir/$chrome_product_full_name.dSYM",
"$root_out_dir/crashpad_handler.dSYM",
]
- if (enable_xpc_notifications) {
- _dsyms += [ "$root_out_dir/AlertNotificationService.dSYM" ]
- }
-
sources = _chrome_symbols_sources
_output = "$root_out_dir/$chrome_product_full_name.dSYM.tar.bz2"
@@ -1303,12 +1287,9 @@ if (is_win) {
":chrome_app",
":chrome_framework",
":chrome_helper_app",
+ "//chrome/browser/ui/cocoa/notifications:alert_notification_xpc_service",
"//third_party/crashpad/crashpad/handler:crashpad_handler",
]
-
- if (enable_xpc_notifications) {
- deps += [ "//chrome/browser/ui/cocoa/notifications:alert_notification_xpc_service" ]
- }
}
} else {
group("chrome_dump_syms") {
« no previous file with comments | « BUILD.gn ('k') | chrome/browser/notifications/notification_platform_bridge_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698