Chromium Code Reviews| Index: device/bluetooth/BUILD.gn |
| diff --git a/device/bluetooth/BUILD.gn b/device/bluetooth/BUILD.gn |
| index 04f46ae71e739f5a42985ed2ca8035bec920f4d8..27a43158302c601c671b86c109bd08ed7695b0f9 100644 |
| --- a/device/bluetooth/BUILD.gn |
| +++ b/device/bluetooth/BUILD.gn |
| @@ -123,9 +123,15 @@ component("bluetooth") { |
| "//ui/base", |
| ] |
| - if (is_win) { |
| - libs = [ "setupapi.lib" ] |
| - } else if (is_chromeos) { |
| + if (is_android) { |
| + deps += [ |
| + "//device/bluetooth/android", |
| + "//device/bluetooth/android:bluetooth_jni", |
| + ] |
| + allow_circular_includes_from = [ "//device/bluetooth/android" ] |
|
cjhopman
2015/05/06 16:56:14
It looks like you need this because you have the j
timvolodine
2015/05/06 17:27:10
+1 if you can avoid 'allow_circular_includes'. I d
cjhopman
2015/05/06 17:51:20
It does look like the vibration change introduces
scheib
2015/05/06 19:14:07
I've merged the GN files, with just one target thi
|
| + } |
| + |
| + if (is_chromeos) { |
| deps += [ |
| "//chromeos", |
| "//dbus", |
| @@ -135,6 +141,10 @@ component("bluetooth") { |
| if (is_mac) { |
| libs = [ "IOBluetooth.framework" ] |
| } |
| + |
| + if (is_win) { |
| + libs = [ "setupapi.lib" ] |
| + } |
| } |
| grit("strings") { |