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 |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
111 } | 111 } |
112 | 112 |
113 if (rtc_relative_path) { | 113 if (rtc_relative_path) { |
114 defines += [ "EXPAT_RELATIVE_PATH" ] | 114 defines += [ "EXPAT_RELATIVE_PATH" ] |
115 } | 115 } |
116 | 116 |
117 if (!rtc_libvpx_build_vp9) { | 117 if (!rtc_libvpx_build_vp9) { |
118 defines += [ "RTC_DISABLE_VP9" ] | 118 defines += [ "RTC_DISABLE_VP9" ] |
119 } | 119 } |
120 | 120 |
| 121 if (rtc_enable_sctp) { |
| 122 defines += [ "HAVE_SCTP" ] |
| 123 } |
| 124 |
121 if (build_with_chromium) { | 125 if (build_with_chromium) { |
122 defines += [ | 126 defines += [ |
123 # NOTICE: Since common_inherited_config is used in public_configs for our | 127 # NOTICE: Since common_inherited_config is used in public_configs for our |
124 # targets, there's no point including the defines in that config here. | 128 # targets, there's no point including the defines in that config here. |
125 # TODO(kjellander): Cleanup unused ones and move defines closer to the | 129 # TODO(kjellander): Cleanup unused ones and move defines closer to the |
126 # source when webrtc:4256 is completed. | 130 # source when webrtc:4256 is completed. |
127 "ENABLE_EXTERNAL_AUTH", | 131 "ENABLE_EXTERNAL_AUTH", |
128 "HAVE_OPENSSL_SSL_H", | 132 "HAVE_OPENSSL_SSL_H", |
129 "HAVE_SCTP", | |
130 "HAVE_SRTP", | 133 "HAVE_SRTP", |
131 "HAVE_WEBRTC_VIDEO", | 134 "HAVE_WEBRTC_VIDEO", |
132 "HAVE_WEBRTC_VOICE", | 135 "HAVE_WEBRTC_VOICE", |
133 "LOGGING_INSIDE_WEBRTC", | 136 "LOGGING_INSIDE_WEBRTC", |
134 "SSL_USE_OPENSSL", | 137 "SSL_USE_OPENSSL", |
135 "USE_WEBRTC_DEV_BRANCH", | 138 "USE_WEBRTC_DEV_BRANCH", |
136 ] | 139 ] |
137 } else { | 140 } else { |
138 if (is_posix) { | 141 if (is_posix) { |
139 # Enable more warnings: -Wextra is currently disabled in Chromium. | 142 # Enable more warnings: -Wextra is currently disabled in Chromium. |
(...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
709 ] | 712 ] |
710 | 713 |
711 deps = [ | 714 deps = [ |
712 "//base:base_java_test_support", | 715 "//base:base_java_test_support", |
713 "//webrtc/examples:AppRTCMobile_javalib", | 716 "//webrtc/examples:AppRTCMobile_javalib", |
714 "//webrtc/sdk/android:libjingle_peerconnection_java", | 717 "//webrtc/sdk/android:libjingle_peerconnection_java", |
715 ] | 718 ] |
716 } | 719 } |
717 } | 720 } |
718 } | 721 } |
OLD | NEW |