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("//build/config/features.gni") | 5 import("//build/config/features.gni") |
6 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") |
7 import("//build/util/version.gni") | 7 import("//build/util/version.gni") |
8 import("//remoting/remoting_version.gni") | 8 import("//remoting/remoting_version.gni") |
9 import("//remoting/remoting_enable.gni") | 9 import("//remoting/remoting_enable.gni") |
10 import("//testing/test.gni") | 10 import("//testing/test.gni") |
11 | 11 |
12 # Various remoting targets need this version definition. | 12 # Various remoting targets need this version definition. |
13 config("version") { | 13 config("version") { |
14 defines = [ "VERSION=$chrome_version_full" ] | 14 defines = [ "VERSION=$chrome_version_full" ] |
15 if (is_android) { | |
Sergey Ulanov
2016/03/16 19:12:35
config(version) is not the right place to add this
| |
16 defines += [ "DISABLE_WEBRTC=1" ] | |
Lambros
2016/03/16 18:12:20
I don't think this is the right way.
We already h
Yuwei
2016/03/16 18:39:01
To follow the pattern in remoting_options.gni, I t
Sergey Ulanov
2016/03/16 19:12:35
Suggest calling it ENABLE_WEBRTC_REMOTING_CLIENT t
Sergey Ulanov
2016/03/16 19:12:35
You need similar change for GYP.
Just add a condi
Sergey Ulanov
2016/03/16 19:12:36
I think ideally we want to disable it only for off
Yuwei
2016/03/16 19:45:34
So we are disabling WebRTC on all platform, right?
Sergey Ulanov
2016/03/16 20:13:12
Correct. Beside Android that only makes difference
| |
17 } | |
15 } | 18 } |
16 | 19 |
17 group("remoting_all") { | 20 group("remoting_all") { |
18 testonly = true | 21 testonly = true |
19 | 22 |
20 deps = [ | 23 deps = [ |
21 #"//remoting:remoting_browser_test_resources", | 24 #"//remoting:remoting_browser_test_resources", |
22 "//remoting:remoting_unittests", | 25 "//remoting:remoting_unittests", |
23 "//remoting/test:chromoting_test_driver", | 26 "//remoting/test:chromoting_test_driver", |
24 | 27 |
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
188 | 191 |
189 if (enable_webrtc) { | 192 if (enable_webrtc) { |
190 deps += [ "//third_party/libjingle:libjingle_webrtc" ] | 193 deps += [ "//third_party/libjingle:libjingle_webrtc" ] |
191 } | 194 } |
192 } | 195 } |
193 } | 196 } |
194 } else { | 197 } else { |
195 group("remoting_unittests") { | 198 group("remoting_unittests") { |
196 } | 199 } |
197 } | 200 } |
OLD | NEW |