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

Unified Diff: chrome/common/BUILD.gn

Issue 2942643002: Break up the chrome/common:common target (Closed)
Patch Set: missing file Created 3 years, 6 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 | « no previous file | chrome/common/cloud_print/BUILD.gn » ('j') | chrome/common/cloud_print/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/BUILD.gn
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
index e975e3e0f8f3d243296a4b7c0fab380f9adba013..68788c265ee212226fde76b7904a0758af1d69e6 100644
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -48,14 +48,8 @@ buildflag_header("features") {
]
}
-# Use a static library here because many test binaries depend on this but don't
-# require many files from it. This makes linking more efficient.
-static_library("common") {
+source_set("channel_info") {
sources = [
- "all_messages.h",
- "attrition_experiments.h",
- "auto_start_linux.cc",
- "auto_start_linux.h",
"channel_info.cc",
"channel_info.h",
"channel_info_android.cc",
@@ -63,6 +57,30 @@ static_library("common") {
"channel_info_mac.mm",
"channel_info_posix.cc",
"channel_info_win.cc",
+ ]
+
+ # DO NOT SUBMIT. Preexisting logic. Validate substractive approach.
agrieve 2017/06/15 13:52:00 Maybe address this DO NOT SUBMIT if the change is
manzagop (departed) 2017/06/15 14:54:59 Yup! I meant to ask if there's any reason for the
+ if (is_android || is_chromeos || is_mac) {
+ sources -= [ "channel_info_posix.cc" ]
agrieve 2017/06/15 13:52:00 Rather than adding and then removing channel_info_
manzagop (departed) 2017/06/15 14:54:59 Totally! Done.
+ }
+ public_deps = [
+ "//base",
+ "//components/version_info",
+ "//components/version_info:version_string",
+ ]
+ if (is_win) {
+ public_deps += [ "//chrome/install_static:install_static_util" ]
+ }
+}
+
+# Use a static library here because many test binaries depend on this but don't
+# require many files from it. This makes linking more efficient.
+static_library("common") {
+ sources = [
+ "all_messages.h",
+ "attrition_experiments.h",
+ "auto_start_linux.cc",
+ "auto_start_linux.h",
"child_process_logging.h",
"child_process_logging_win.cc",
"chrome_content_client.cc",
@@ -166,6 +184,7 @@ static_library("common") {
]
public_deps = [
+ ":channel_info",
":features",
":mojo_bindings",
":page_load_metrics_mojom",
@@ -214,8 +233,6 @@ static_library("common") {
"//components/translate/core/common",
"//components/url_formatter",
"//components/variations",
- "//components/version_info",
- "//components/version_info:version_string",
"//components/visitedlink/common",
"//content/public/common",
"//crypto",
@@ -229,7 +246,6 @@ static_library("common") {
"//media",
"//mojo/edk/system",
"//mojo/public/cpp/bindings",
- "//net",
"//pdf:features",
"//ppapi/features",
"//printing/features",
@@ -379,21 +395,10 @@ static_library("common") {
# Printing.
if (enable_basic_printing || enable_print_preview) {
- sources += [
- "chrome_utility_printing_messages.h",
- "cloud_print/cloud_print_cdd_conversion.cc",
- "cloud_print/cloud_print_cdd_conversion.h",
- "cloud_print/cloud_print_class_mac.h",
- "cloud_print/cloud_print_class_mac.mm",
- "cloud_print/cloud_print_constants.cc",
- "cloud_print/cloud_print_constants.h",
- "cloud_print/cloud_print_helpers.cc",
- "cloud_print/cloud_print_helpers.h",
- "cloud_print/cloud_print_proxy_info.cc",
- "cloud_print/cloud_print_proxy_info.h",
- ]
+ sources += [ "chrome_utility_printing_messages.h" ]
public_deps += [
+ "//chrome/common/cloud_print",
"//components/printing/common",
"//printing",
]
@@ -413,10 +418,7 @@ static_library("common") {
}
if (is_android) {
- sources -= [
- "channel_info_posix.cc",
- "media_galleries/metadata_types.h",
- ]
+ sources -= [ "media_galleries/metadata_types.h" ]
sources += [
"media/chrome_media_drm_bridge_client.cc",
"media/chrome_media_drm_bridge_client.h",
@@ -455,13 +457,8 @@ static_library("common") {
]
}
- if (is_chromeos) {
- sources -= [ "channel_info_posix.cc" ]
- }
-
if (is_win) {
public_deps += [
- "//chrome/install_static:install_static_util",
agrieve 2017/06/15 13:52:00 Do you know what this might have been for?
manzagop (departed) 2017/06/15 14:54:59 Hm. channel_info_win.cc uses it so I'd moved it a
agrieve 2017/06/15 15:06:17 Ah, just missed that it was added above. Unless y
"//components/dom_distiller/core", # Needed by chrome_content_client.cc.
"//third_party/wtl",
]
@@ -470,7 +467,6 @@ static_library("common") {
}
if (is_mac) {
- sources -= [ "channel_info_posix.cc" ]
public_deps += [
"//third_party/google_toolbox_for_mac",
"//third_party/mach_override",
« no previous file with comments | « no previous file | chrome/common/cloud_print/BUILD.gn » ('j') | chrome/common/cloud_print/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698