Commit e5c9431b authored by mostynb's avatar mostynb Committed by Commit bot

//device/media_transfer_protocol depends on dbus

The build should fail early if //device/media_transfer_protocol is included with dbus explicitly disabled.

BUG=632297

Review-Url: https://codereview.chromium.org/2333573003
Cr-Commit-Position: refs/heads/master@{#418744}
parent ea511c32
......@@ -2073,7 +2073,7 @@ split_static_library("browser") {
defines += [ "ENABLE_HOTWORDING" ]
}
if (is_linux) {
if (is_linux && use_dbus) {
deps += [ "//device/media_transfer_protocol" ]
}
......
......@@ -56,7 +56,7 @@ static_library("storage_monitor") {
]
}
if (is_linux) {
if (is_linux && use_dbus) {
deps += [
"//device/media_transfer_protocol",
"//device/media_transfer_protocol:mtp_file_entry_proto",
......@@ -111,7 +111,7 @@ static_library("test_support") {
"//content/public/browser",
]
if (is_linux) {
if (is_linux && use_dbus) {
deps = [
"//device/media_transfer_protocol",
"//device/media_transfer_protocol:mtp_file_entry_proto",
......@@ -146,7 +146,7 @@ source_set("unit_tests") {
"//testing/gtest",
]
if (is_linux) {
if (is_linux && use_dbus) {
deps += [ "//device/media_transfer_protocol" ]
if (!is_chromeos) {
sources += [ "storage_monitor_linux_unittest.cc" ]
......
......@@ -5,6 +5,8 @@
import("//build/config/features.gni")
import("//third_party/protobuf/proto_library.gni")
assert(use_dbus)
# GYP version: device/media_transfer_protocol/media_transfer_protocol.gyp:mtp_file_entry_proto
proto_library("mtp_file_entry_proto") {
sources = [
......
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