summaryrefslogtreecommitdiffstats
path: root/device
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-04-01 22:34:43 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-02 05:35:19 +0000
commit157d6cf61658ef8c7486e4df5c1f697bf4d291fe (patch)
treea2eea3236a48a1bd2fa3db4fe777fb1c8fa5a1e8 /device
parent15a16244bd70fdd1f9cd27cb73dd5e981d5aa379 (diff)
downloadchromium_src-157d6cf61658ef8c7486e4df5c1f697bf4d291fe.zip
chromium_src-157d6cf61658ef8c7486e4df5c1f697bf4d291fe.tar.gz
chromium_src-157d6cf61658ef8c7486e4df5c1f697bf4d291fe.tar.bz2
Work on GN Windows component build.
The platform window target was set up to be a component but had no compilation units. This patch removes the defines from both builds. Removes the gpu_memory_buffer_manager target. This was causing problems and no equivalent exists in GYP. Does some cleanup of Windows ldflags BUG=470212 R=jam TBR=rockot@chromium.org (device/bluetooth) Review URL: https://codereview.chromium.org/1019803003 Cr-Commit-Position: refs/heads/master@{#323432}
Diffstat (limited to 'device')
-rw-r--r--device/bluetooth/BUILD.gn4
1 files changed, 3 insertions, 1 deletions
diff --git a/device/bluetooth/BUILD.gn b/device/bluetooth/BUILD.gn
index 48c8f82..3153255 100644
--- a/device/bluetooth/BUILD.gn
+++ b/device/bluetooth/BUILD.gn
@@ -118,7 +118,9 @@ component("bluetooth") {
"//ui/base",
]
- if (is_chromeos) {
+ if (is_win) {
+ libs = [ "setupapi.lib" ]
+ } else if (is_chromeos) {
deps += [
"//chromeos",
"//dbus",