diff options
author | rdevlin.cronin <rdevlin.cronin@chromium.org> | 2015-02-19 17:07:21 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-02-20 01:08:08 +0000 |
commit | 28274b27a18a29c8a5d3bdda150f3c47e6a28584 (patch) | |
tree | 9ce60dbb42bf5a6b33ed22b6fb32facea1430bef /device | |
parent | 9b589eef280cf8ca934903d0613157ad8b5c0379 (diff) | |
download | chromium_src-28274b27a18a29c8a5d3bdda150f3c47e6a28584.zip chromium_src-28274b27a18a29c8a5d3bdda150f3c47e6a28584.tar.gz chromium_src-28274b27a18a29c8a5d3bdda150f3c47e6a28584.tar.bz2 |
Revert of Add more targets to "gn check" (patchset #3 id:40001 of https://codereview.chromium.org/940613002/)
Reason for revert:
This broken win8 gn bots because of an illegal include.
ERROR at //device/usb/usb_service_impl.cc:21:11: Include not allowed.
#include "device/core/device_monitor_win.h"
e.g.
https://build.chromium.org/p/chromium.win/builders/Win8%20GN/builds/4896/steps/gn%20check/logs/stdio
Original issue's description:
> Add more targets to "gn check"
>
> R=dpranke
> TBR=armansito@chromium.org (bluetooth)
>
> Committed: https://crrev.com/8cac5f9d9c3847657b57783d30f861adb6c29cac
> Cr-Commit-Position: refs/heads/master@{#317160}
TBR=dpranke@chromium.org,armansito@chromium.org,brettw@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/941893002
Cr-Commit-Position: refs/heads/master@{#317204}
Diffstat (limited to 'device')
-rw-r--r-- | device/bluetooth/BUILD.gn | 4 | ||||
-rw-r--r-- | device/core/BUILD.gn | 4 | ||||
-rw-r--r-- | device/hid/BUILD.gn | 3 | ||||
-rw-r--r-- | device/media_transfer_protocol/BUILD.gn | 10 | ||||
-rw-r--r-- | device/serial/BUILD.gn | 8 | ||||
-rw-r--r-- | device/usb/BUILD.gn | 3 | ||||
-rw-r--r-- | device/vibration/BUILD.gn | 1 | ||||
-rw-r--r-- | device/vibration/android/BUILD.gn | 2 |
8 files changed, 3 insertions, 32 deletions
diff --git a/device/bluetooth/BUILD.gn b/device/bluetooth/BUILD.gn index 5e53d8f..0e70391 100644 --- a/device/bluetooth/BUILD.gn +++ b/device/bluetooth/BUILD.gn @@ -214,10 +214,6 @@ static_library("mocks") { deps = [ ":bluetooth", - "//net", "//testing/gmock", ] - public_deps = [ - "//base", - ] } diff --git a/device/core/BUILD.gn b/device/core/BUILD.gn index d931807..eefca3b 100644 --- a/device/core/BUILD.gn +++ b/device/core/BUILD.gn @@ -9,8 +9,4 @@ 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 64e99c4..6dc7b17 100644 --- a/device/hid/BUILD.gn +++ b/device/hid/BUILD.gn @@ -49,7 +49,4 @@ 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 a36c606..cd37089 100644 --- a/device/media_transfer_protocol/BUILD.gn +++ b/device/media_transfer_protocol/BUILD.gn @@ -29,16 +29,10 @@ 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 099b7ad..1382604 100644 --- a/device/serial/BUILD.gn +++ b/device/serial/BUILD.gn @@ -43,18 +43,12 @@ 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 cc3646e..d4be7cf 100644 --- a/device/usb/BUILD.gn +++ b/device/usb/BUILD.gn @@ -43,9 +43,6 @@ 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 fe5a19d..d2de6ab 100644 --- a/device/vibration/BUILD.gn +++ b/device/vibration/BUILD.gn @@ -33,7 +33,6 @@ 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 ec6ab6c..5d9aa22 100644 --- a/device/vibration/android/BUILD.gn +++ b/device/vibration/android/BUILD.gn @@ -16,8 +16,6 @@ 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. |