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 if (rtc_include_tests) { | |
| 30 defines += [ "WEBRTC_NON_CONST_TRACE_EVENT_HANDLERS" ] | |
|
kjellander_webrtc
2017/08/16 12:17:14
Please add a comment explaining why this is needed
kwiberg-webrtc
2017/08/16 13:11:40
Please consider always defining this (to 0 or 1, f
ehmaldonado_webrtc
2017/08/16 13:40:57
Done.
| |
| 31 } | |
| 29 if (build_with_chromium) { | 32 if (build_with_chromium) { |
| 30 defines = [ | 33 defines = [ |
| 31 # TODO(kjellander): Cleanup unused ones and move defines closer to | 34 # TODO(kjellander): Cleanup unused ones and move defines closer to |
| 32 # the source when webrtc:4256 is completed. | 35 # the source when webrtc:4256 is completed. |
| 33 "FEATURE_ENABLE_VOICEMAIL", | 36 "FEATURE_ENABLE_VOICEMAIL", |
| 34 "EXPAT_RELATIVE_PATH", | 37 "EXPAT_RELATIVE_PATH", |
| 35 "GTEST_RELATIVE_PATH", | 38 "GTEST_RELATIVE_PATH", |
| 36 "WEBRTC_CHROMIUM_BUILD", | 39 "WEBRTC_CHROMIUM_BUILD", |
| 37 ] | 40 ] |
| 38 include_dirs = [ | 41 include_dirs = [ |
| (...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 534 ] | 537 ] |
| 535 | 538 |
| 536 deps = [ | 539 deps = [ |
| 537 "examples:AppRTCMobile_javalib", | 540 "examples:AppRTCMobile_javalib", |
| 538 "sdk/android:libjingle_peerconnection_java", | 541 "sdk/android:libjingle_peerconnection_java", |
| 539 "//base:base_java_test_support", | 542 "//base:base_java_test_support", |
| 540 ] | 543 ] |
| 541 } | 544 } |
| 542 } | 545 } |
| 543 } | 546 } |
| OLD | NEW |