Commit e244d3f6 authored by Luum Habtemariam's avatar Luum Habtemariam Committed by Commit Bot

Only build CupsProxyService internals w/ libCUPS

Currently breaking a veyron build, bug linked below, since SocketManager
is built regardless of libCUPS, but still technically depends on the
kHttpMaxBufferSize constant in cups_proxy/public/cpp/cups_util.

Though we could bring the constant to the SocketManager internals, there
is no clear reason for SocketManager to be built this way so this just brings it in line with the rest of the service internals..

TBR=rockot@chromium.org,skau@chromium.org

Bug: chromium:971906
Test: tests still pass && speculative build-breaking fix
Change-Id: Ic9b873093152c4bff01ed940551db2cdf36605c3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1648747
Commit-Queue: Luum Habtemariam <luum@chromium.org>
Reviewed-by: default avatarAchuith Bhandarkar <achuith@chromium.org>
Cr-Commit-Position: refs/heads/master@{#667296}
parent 02948309
...@@ -14,8 +14,6 @@ source_set("cups_proxy") { ...@@ -14,8 +14,6 @@ source_set("cups_proxy") {
"cups_proxy_service.h", "cups_proxy_service.h",
"cups_proxy_service_delegate.cc", "cups_proxy_service_delegate.cc",
"cups_proxy_service_delegate.h", "cups_proxy_service_delegate.h",
"socket_manager.cc",
"socket_manager.h",
] ]
deps = [ deps = [
...@@ -34,6 +32,8 @@ source_set("cups_proxy") { ...@@ -34,6 +32,8 @@ source_set("cups_proxy") {
sources += [ sources += [
"printer_installer.cc", "printer_installer.cc",
"printer_installer.h", "printer_installer.h",
"socket_manager.cc",
"socket_manager.h",
] ]
} }
...@@ -57,23 +57,23 @@ static_library("test_support") { ...@@ -57,23 +57,23 @@ static_library("test_support") {
source_set("unit_tests") { source_set("unit_tests") {
testonly = true testonly = true
sources = [ # Target is empty unless libCUPS is available.
"socket_manager_unittest.cc", if (use_cups) {
] sources = [
"printer_installer_unittest.cc",
"socket_manager_unittest.cc",
]
deps = [ deps = [
":cups_proxy", ":cups_proxy",
":test_support", ":test_support",
"//base", "//base",
"//chrome/services/cups_proxy/public/cpp", "//chrome/services/cups_proxy/public/cpp",
"//testing/gtest", "//testing/gtest",
] ]
if (use_cups) { data = [
sources += [ "printer_installer_unittest.cc" ] "//chrome/test/data/cups_proxy",
]
} }
data = [
"//chrome/test/data/cups_proxy",
]
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment