| Index: chrome/common/BUILD.gn
|
| diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
|
| index e975e3e0f8f3d243296a4b7c0fab380f9adba013..60f4108a43ae4e58a4b13ad8160c5ce745efcd0f 100644
|
| --- a/chrome/common/BUILD.gn
|
| +++ b/chrome/common/BUILD.gn
|
| @@ -48,6 +48,29 @@ buildflag_header("features") {
|
| ]
|
| }
|
|
|
| +source_set("channel_info") {
|
| + sources = [
|
| + "channel_info.cc",
|
| + "channel_info.h",
|
| + "channel_info_android.cc",
|
| + "channel_info_chromeos.cc",
|
| + "channel_info_mac.mm",
|
| + "channel_info_win.cc",
|
| + ]
|
| +
|
| + if (!is_android && !is_chromeos && !is_mac) {
|
| + sources += [ "channel_info_posix.cc" ]
|
| + }
|
| + 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") {
|
| @@ -56,13 +79,6 @@ static_library("common") {
|
| "attrition_experiments.h",
|
| "auto_start_linux.cc",
|
| "auto_start_linux.h",
|
| - "channel_info.cc",
|
| - "channel_info.h",
|
| - "channel_info_android.cc",
|
| - "channel_info_chromeos.cc",
|
| - "channel_info_mac.mm",
|
| - "channel_info_posix.cc",
|
| - "channel_info_win.cc",
|
| "child_process_logging.h",
|
| "child_process_logging_win.cc",
|
| "chrome_content_client.cc",
|
| @@ -166,6 +182,7 @@ static_library("common") {
|
| ]
|
|
|
| public_deps = [
|
| + ":channel_info",
|
| ":features",
|
| ":mojo_bindings",
|
| ":page_load_metrics_mojom",
|
| @@ -214,8 +231,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 +244,6 @@ static_library("common") {
|
| "//media",
|
| "//mojo/edk/system",
|
| "//mojo/public/cpp/bindings",
|
| - "//net",
|
| "//pdf:features",
|
| "//ppapi/features",
|
| "//printing/features",
|
| @@ -379,21 +393,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 +416,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 +455,8 @@ static_library("common") {
|
| ]
|
| }
|
|
|
| - if (is_chromeos) {
|
| - sources -= [ "channel_info_posix.cc" ]
|
| - }
|
| -
|
| if (is_win) {
|
| public_deps += [
|
| - "//chrome/install_static:install_static_util",
|
| "//components/dom_distiller/core", # Needed by chrome_content_client.cc.
|
| "//third_party/wtl",
|
| ]
|
| @@ -470,7 +465,6 @@ static_library("common") {
|
| }
|
|
|
| if (is_mac) {
|
| - sources -= [ "channel_info_posix.cc" ]
|
| public_deps += [
|
| "//third_party/google_toolbox_for_mac",
|
| "//third_party/mach_override",
|
|
|