Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. |
| 2 # | 2 # |
| 3 # Use of this source code is governed by a BSD-style license | 3 # Use of this source code is governed by a BSD-style license |
| 4 # that can be found in the LICENSE file in the root of the source | 4 # that can be found in the LICENSE file in the root of the source |
| 5 # tree. An additional intellectual property rights grant can be found | 5 # tree. An additional intellectual property rights grant can be found |
| 6 # in the file PATENTS. All contributing project authors may | 6 # in the file PATENTS. All contributing project authors may |
| 7 # be found in the AUTHORS file in the root of the source tree. | 7 # be found in the AUTHORS file in the root of the source tree. |
| 8 | 8 |
| 9 import("//build/config/crypto.gni") | 9 import("//build/config/crypto.gni") |
| 10 import("//build/config/ui.gni") | 10 import("//build/config/ui.gni") |
| (...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 287 } | 287 } |
| 288 if (is_nacl) { | 288 if (is_nacl) { |
| 289 deps += [ "//native_client_sdk/src/libraries/nacl_io" ] | 289 deps += [ "//native_client_sdk/src/libraries/nacl_io" ] |
| 290 } | 290 } |
| 291 } | 291 } |
| 292 | 292 |
| 293 config("enable_libevent_config") { | 293 config("enable_libevent_config") { |
| 294 defines = [ "WEBRTC_BUILD_LIBEVENT" ] | 294 defines = [ "WEBRTC_BUILD_LIBEVENT" ] |
| 295 } | 295 } |
| 296 | 296 |
| 297 rtc_static_library("rtc_task_queue") { | 297 rtc_source_set("rtc_task_queue") { |
| 298 public_deps = [ | 298 public_deps = [ |
| 299 ":rtc_base_approved", | 299 ":rtc_base_approved", |
| 300 ] | 300 ] |
| 301 | 301 |
| 302 if (rtc_link_task_queue_impl) { | |
| 303 public_deps += [ ":rtc_task_queue_impl" ] | |
|
nisse-webrtc
2017/08/23 11:00:25
I was thinking of adding the dependency on rtc_tas
perkj_webrtc
2017/08/23 11:12:37
That is what I did in a previous cl. But I think i
nisse-webrtc
2017/08/23 11:24:46
Ok. We could refine it to say that whoever instant
| |
| 304 } else { | |
| 305 if (build_with_chromium) { | |
| 306 sources = [ | |
| 307 "../../webrtc_overrides/webrtc/rtc_base/task_queue.h", | |
| 308 ] | |
| 309 } else { | |
| 310 sources = [ | |
| 311 "task_queue.h", | |
| 312 ] | |
| 313 } | |
| 314 } | |
| 315 } | |
| 316 | |
| 317 rtc_source_set("rtc_task_queue_impl") { | |
| 318 deps = [ | |
| 319 ":rtc_base_approved", | |
| 320 ] | |
| 302 if (build_with_chromium) { | 321 if (build_with_chromium) { |
| 303 sources = [ | 322 sources = [ |
| 304 "../../webrtc_overrides/webrtc/rtc_base/task_queue.cc", | 323 "../../webrtc_overrides/webrtc/rtc_base/task_queue.cc", |
| 305 "../../webrtc_overrides/webrtc/rtc_base/task_queue.h", | 324 "../../webrtc_overrides/webrtc/rtc_base/task_queue.h", |
| 306 ] | 325 ] |
| 307 } else { | 326 } else { |
| 308 sources = [ | 327 sources = [ |
| 309 "task_queue.h", | 328 "task_queue.h", |
|
nisse-webrtc
2017/08/23 11:00:25
It's not so nice to task_queue.h in multiple targe
perkj_webrtc
2017/08/23 11:12:37
Sure
mbonadei
2017/08/23 12:12:29
I agree, we should create a separate _api target.
| |
| 310 "task_queue_posix.h", | |
| 311 ] | 329 ] |
| 312 if (rtc_build_libevent) { | 330 if (rtc_build_libevent) { |
| 313 deps = [ | 331 deps += [ "//base/third_party/libevent" ] |
| 314 "//base/third_party/libevent", | |
| 315 ] | |
| 316 } | 332 } |
| 317 | |
| 318 if (rtc_enable_libevent) { | 333 if (rtc_enable_libevent) { |
| 319 sources += [ | 334 sources += [ |
| 320 "task_queue_libevent.cc", | 335 "task_queue_libevent.cc", |
| 321 "task_queue_posix.cc", | 336 "task_queue_posix.cc", |
| 337 "task_queue_posix.h", | |
| 322 ] | 338 ] |
| 323 all_dependent_configs = [ ":enable_libevent_config" ] | 339 all_dependent_configs = [ ":enable_libevent_config" ] |
| 324 } else { | 340 } else { |
| 325 if (is_mac || is_ios) { | 341 if (is_mac || is_ios) { |
| 326 sources += [ | 342 sources += [ |
| 327 "task_queue_gcd.cc", | 343 "task_queue_gcd.cc", |
| 328 "task_queue_posix.cc", | 344 "task_queue_posix.cc", |
| 329 ] | 345 ] |
| 330 } | 346 } |
| 331 if (is_win) { | 347 if (is_win) { |
| (...skipping 699 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1031 if (is_android) { | 1047 if (is_android) { |
| 1032 android_library("base_java") { | 1048 android_library("base_java") { |
| 1033 java_files = [ | 1049 java_files = [ |
| 1034 "java/src/org/webrtc/ContextUtils.java", | 1050 "java/src/org/webrtc/ContextUtils.java", |
| 1035 "java/src/org/webrtc/Logging.java", | 1051 "java/src/org/webrtc/Logging.java", |
| 1036 "java/src/org/webrtc/Size.java", | 1052 "java/src/org/webrtc/Size.java", |
| 1037 "java/src/org/webrtc/ThreadUtils.java", | 1053 "java/src/org/webrtc/ThreadUtils.java", |
| 1038 ] | 1054 ] |
| 1039 } | 1055 } |
| 1040 } | 1056 } |
| OLD | NEW |