From 8cac5f9d9c3847657b57783d30f861adb6c29cac Mon Sep 17 00:00:00 2001 From: brettw Date: Thu, 19 Feb 2015 15:04:00 -0800 Subject: Add more targets to "gn check" R=dpranke TBR=armansito@chromium.org (bluetooth) Review URL: https://codereview.chromium.org/940613002 Cr-Commit-Position: refs/heads/master@{#317160} --- .gn | 6 ++++++ dbus/BUILD.gn | 1 + device/bluetooth/BUILD.gn | 4 ++++ device/core/BUILD.gn | 4 ++++ device/hid/BUILD.gn | 3 +++ device/media_transfer_protocol/BUILD.gn | 10 ++++++++-- device/serial/BUILD.gn | 8 +++++++- device/usb/BUILD.gn | 3 +++ device/vibration/BUILD.gn | 1 + device/vibration/android/BUILD.gn | 2 ++ 10 files changed, 39 insertions(+), 3 deletions(-) diff --git a/.gn b/.gn index 1429a87..1dea107 100644 --- a/.gn +++ b/.gn @@ -19,6 +19,12 @@ check_targets = [ # build/config/android/rules.gni "java_cpp_enum" template with # check_includes = false. #"//base/*", + "//build/*", "//cc/*", + "//dbus/*", + "//device/*", "//ipc/*", + "//sql/*", + "//storage/*", + "//url/*", ] diff --git a/dbus/BUILD.gn b/dbus/BUILD.gn index 4abcdb8..27f24d7 100644 --- a/dbus/BUILD.gn +++ b/dbus/BUILD.gn @@ -69,6 +69,7 @@ source_set("test_support") { public_deps = [ ":dbus", + "//base", ] deps = [ "//testing/gmock", diff --git a/device/bluetooth/BUILD.gn b/device/bluetooth/BUILD.gn index 0e70391..5e53d8f 100644 --- a/device/bluetooth/BUILD.gn +++ b/device/bluetooth/BUILD.gn @@ -214,6 +214,10 @@ static_library("mocks") { deps = [ ":bluetooth", + "//net", "//testing/gmock", ] + public_deps = [ + "//base", + ] } diff --git a/device/core/BUILD.gn b/device/core/BUILD.gn index eefca3b..d931807 100644 --- a/device/core/BUILD.gn +++ b/device/core/BUILD.gn @@ -9,4 +9,8 @@ source_set("core") { "device_monitor_win.cc", "device_monitor_win.h", ] + + public_deps = [ + "//base", + ] } diff --git a/device/hid/BUILD.gn b/device/hid/BUILD.gn index 6dc7b17..64e99c4 100644 --- a/device/hid/BUILD.gn +++ b/device/hid/BUILD.gn @@ -49,4 +49,7 @@ source_set("hid") { if (is_linux) { deps += [ "//device/udev_linux" ] } + if (is_chromeos) { + deps += [ "//chromeos" ] + } } diff --git a/device/media_transfer_protocol/BUILD.gn b/device/media_transfer_protocol/BUILD.gn index cd37089..a36c606 100644 --- a/device/media_transfer_protocol/BUILD.gn +++ b/device/media_transfer_protocol/BUILD.gn @@ -29,10 +29,16 @@ static_library("media_transfer_protocol") { "media_transfer_protocol_manager.h", ] - configs += [ "//build/config/linux:dbus" ] - public_deps = [ ":mtp_file_entry_proto", ":mtp_storage_info_proto", + "//base", + ] + deps = [ + "//dbus", ] + + if (is_chromeos) { + deps += [ "//chromeos" ] + } } diff --git a/device/serial/BUILD.gn b/device/serial/BUILD.gn index 1382604..099b7ad 100644 --- a/device/serial/BUILD.gn +++ b/device/serial/BUILD.gn @@ -43,12 +43,18 @@ static_library("serial") { public_deps = [ ":serial_mojo", + "//base", + ] + deps = [ + "//third_party/mojo/src/mojo/public/cpp/system", ] - deps = [] if (is_linux) { deps += [ "//device/udev_linux" ] } + if (is_chromeos) { + deps += [ "//chromeos" ] + } } # GYP version: device/serial/serial.gyp:device_serial_test_util diff --git a/device/usb/BUILD.gn b/device/usb/BUILD.gn index d4be7cf..cc3646e 100644 --- a/device/usb/BUILD.gn +++ b/device/usb/BUILD.gn @@ -43,6 +43,9 @@ source_set("usb") { if (is_linux) { deps += [ "//device/udev_linux" ] } + if (is_chromeos) { + deps += [ "//chromeos" ] + } } action("usb_device_ids") { diff --git a/device/vibration/BUILD.gn b/device/vibration/BUILD.gn index d2de6ab..fe5a19d 100644 --- a/device/vibration/BUILD.gn +++ b/device/vibration/BUILD.gn @@ -33,6 +33,7 @@ component("vibration") { "//device/vibration/android", "//device/vibration/android:vibration_jni_headers", ] + allow_circular_includes_from = [ "//device/vibration/android" ] } } diff --git a/device/vibration/android/BUILD.gn b/device/vibration/android/BUILD.gn index 5d9aa22..ec6ab6c 100644 --- a/device/vibration/android/BUILD.gn +++ b/device/vibration/android/BUILD.gn @@ -16,6 +16,8 @@ source_set("android") { defines = [ "DEVICE_VIBRATION_IMPLEMENTATION" ] deps = [ + "//base", + # vibration_jni_registrar.cc includes a header from device/vibration # that includes a mojo-generated header file. Make sure the header # is generated before vibration_jni_registrar.cc is compiled. -- cgit v1.1