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 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. | 9 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. | 
| 10 | 10 | 
| 11 import("//build/config/linux/pkg_config.gni") | 11 import("//build/config/linux/pkg_config.gni") | 
| 12 import("//build/config/sanitizers/sanitizers.gni") | 12 import("//build/config/sanitizers/sanitizers.gni") | 
| 13 import("webrtc.gni") | 13 import("webrtc.gni") | 
| 14 import("//third_party/protobuf/proto_library.gni") | 14 import("//third_party/protobuf/proto_library.gni") | 
| 15 if (is_android) { | 15 if (is_android) { | 
| 16 import("//build/config/android/config.gni") | 16 import("//build/config/android/config.gni") | 
| 17 import("//build/config/android/rules.gni") | 17 import("//build/config/android/rules.gni") | 
| 18 } | 18 } | 
| 19 | 19 | 
| 20 # Contains the defines and includes in common.gypi that are duplicated both as | 20 # Contains the defines and includes in common.gypi that are duplicated both as | 
| 21 # target_defaults and direct_dependent_settings. | 21 # target_defaults and direct_dependent_settings. | 
| 22 config("common_inherited_config") { | 22 config("common_inherited_config") { | 
| 23 defines = [] | 23 defines = [] | 
| 24 cflags = [] | 24 cflags = [] | 
| 25 ldflags = [] | 25 ldflags = [] | 
| 26 if (build_with_mozilla) { | 26 if (build_with_mozilla) { | 
| 27 defines += [ "WEBRTC_MOZILLA_BUILD" ] | 27 defines += [ "WEBRTC_MOZILLA_BUILD" ] | 
| 28 } | 28 } | 
| 29 | |
| 
 
aleloi
2017/08/22 09:04:03
Blank line added by 'git cl format'
 
kwiberg-webrtc
2017/08/22 11:21:15
Acknowledged.
 
 | |
| 29 # Some tests need to declare their own trace event handlers. If this define is | 30 # Some tests need to declare their own trace event handlers. If this define is | 
| 30 # not set, the first time TRACE_EVENT_* is called it will store the return | 31 # not set, the first time TRACE_EVENT_* is called it will store the return | 
| 31 # value for the current handler in an static variable, so that subsequent | 32 # value for the current handler in an static variable, so that subsequent | 
| 32 # changes to the handler for that TRACE_EVENT_* will be ignored. | 33 # changes to the handler for that TRACE_EVENT_* will be ignored. | 
| 33 # So when tests are included, we set this define, making it possible to use | 34 # So when tests are included, we set this define, making it possible to use | 
| 34 # different event handlers in different tests. | 35 # different event handlers in different tests. | 
| 35 if (rtc_include_tests) { | 36 if (rtc_include_tests) { | 
| 36 defines += [ "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=1" ] | 37 defines += [ "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=1" ] | 
| 37 } else { | 38 } else { | 
| 38 defines += [ "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0" ] | 39 defines += [ "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0" ] | 
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 228 if (use_libfuzzer || use_drfuzz || use_afl) { | 229 if (use_libfuzzer || use_drfuzz || use_afl) { | 
| 229 # Used in Chromium's overrides to disable logging | 230 # Used in Chromium's overrides to disable logging | 
| 230 defines += [ "WEBRTC_UNSAFE_FUZZER_MODE" ] | 231 defines += [ "WEBRTC_UNSAFE_FUZZER_MODE" ] | 
| 231 } | 232 } | 
| 232 } | 233 } | 
| 233 | 234 | 
| 234 config("common_objc") { | 235 config("common_objc") { | 
| 235 libs = [ "Foundation.framework" ] | 236 libs = [ "Foundation.framework" ] | 
| 236 } | 237 } | 
| 237 | 238 | 
| 238 rtc_source_set("video_stream_api") { | |
| 239 sources = [ | |
| 240 "video_receive_stream.h", | |
| 241 "video_send_stream.h", | |
| 242 ] | |
| 243 deps = [ | |
| 244 ":webrtc_common", | |
| 245 "api:transport_api", | |
| 246 "common_video:common_video", | |
| 247 "rtc_base:rtc_base_approved", | |
| 248 ] | |
| 249 } | |
| 250 | |
| 251 if (!build_with_chromium) { | 239 if (!build_with_chromium) { | 
| 252 # Target to build all the WebRTC production code. | 240 # Target to build all the WebRTC production code. | 
| 253 rtc_static_library("webrtc") { | 241 rtc_static_library("webrtc") { | 
| 254 # Only the root target should depend on this. | 242 # Only the root target should depend on this. | 
| 255 visibility = [ "//:default" ] | 243 visibility = [ "//:default" ] | 
| 256 | 244 | 
| 257 sources = [] | 245 sources = [] | 
| 258 complete_static_lib = true | 246 complete_static_lib = true | 
| 259 defines = [] | 247 defines = [] | 
| 260 | 248 | 
| (...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 546 ] | 534 ] | 
| 547 | 535 | 
| 548 deps = [ | 536 deps = [ | 
| 549 "examples:AppRTCMobile_javalib", | 537 "examples:AppRTCMobile_javalib", | 
| 550 "sdk/android:libjingle_peerconnection_java", | 538 "sdk/android:libjingle_peerconnection_java", | 
| 551 "//base:base_java_test_support", | 539 "//base:base_java_test_support", | 
| 552 ] | 540 ] | 
| 553 } | 541 } | 
| 554 } | 542 } | 
| 555 } | 543 } | 
| OLD | NEW |