Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//media/media_options.gni") | 5 import("//media/media_options.gni") |
| 6 import("//remoting/build/config/remoting_build.gni") | 6 import("//remoting/build/config/remoting_build.gni") |
| 7 | 7 |
| 8 group("remoting_all") { | 8 group("remoting_all") { |
| 9 testonly = true | 9 testonly = true |
| 10 | 10 |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 161 "//ui/gfx", | 161 "//ui/gfx", |
| 162 ] | 162 ] |
| 163 } | 163 } |
| 164 | 164 |
| 165 if (enable_webrtc) { | 165 if (enable_webrtc) { |
| 166 deps += [ "//third_party/webrtc_overrides:init_webrtc" ] | 166 deps += [ "//third_party/webrtc_overrides:init_webrtc" ] |
| 167 } | 167 } |
| 168 | 168 |
| 169 if (is_android) { | 169 if (is_android) { |
| 170 deps += [ "//net/android:net_java" ] | 170 deps += [ "//net/android:net_java" ] |
| 171 | |
| 172 libs += [ "android" ] | |
|
Yuwei
2017/03/21 20:40:29
Why is this needed?
nicholss
2017/03/29 20:32:35
The unittests would not link without the android l
| |
| 171 } | 173 } |
| 172 | 174 |
| 173 if (is_win) { | 175 if (is_win) { |
| 174 defines += [ "_ALT_NO_EXCEPTIONS" ] | 176 defines += [ "_ALT_NO_EXCEPTIONS" ] |
| 175 | 177 |
| 176 libs += [ | 178 libs += [ |
| 177 "comctl32.lib", | 179 "comctl32.lib", |
| 178 "rpcrt4.lib", | 180 "rpcrt4.lib", |
| 179 "wtsapi32.lib", | 181 "wtsapi32.lib", |
| 180 ] | 182 ] |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 212 if (is_win) { | 214 if (is_win) { |
| 213 defines += [ "_ALT_NO_EXCEPTIONS" ] | 215 defines += [ "_ALT_NO_EXCEPTIONS" ] |
| 214 | 216 |
| 215 libs += [ | 217 libs += [ |
| 216 "rpcrt4.lib", | 218 "rpcrt4.lib", |
| 217 "wtsapi32.lib", | 219 "wtsapi32.lib", |
| 218 ] | 220 ] |
| 219 } | 221 } |
| 220 } | 222 } |
| 221 } | 223 } |
| OLD | NEW |