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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 } | 119 } |
120 | 120 |
121 if (!rtc_libvpx_build_vp9) { | 121 if (!rtc_libvpx_build_vp9) { |
122 defines += [ "RTC_DISABLE_VP9" ] | 122 defines += [ "RTC_DISABLE_VP9" ] |
123 } | 123 } |
124 | 124 |
125 if (rtc_enable_sctp) { | 125 if (rtc_enable_sctp) { |
126 defines += [ "HAVE_SCTP" ] | 126 defines += [ "HAVE_SCTP" ] |
127 } | 127 } |
128 | 128 |
| 129 if (rtc_enable_media) { |
| 130 defines += [ "HAVE_MEDIA" ] |
| 131 } |
| 132 |
129 if (rtc_enable_external_auth) { | 133 if (rtc_enable_external_auth) { |
130 defines += [ "ENABLE_EXTERNAL_AUTH" ] | 134 defines += [ "ENABLE_EXTERNAL_AUTH" ] |
131 } | 135 } |
132 | 136 |
133 if (build_with_chromium) { | 137 if (build_with_chromium) { |
134 defines += [ | 138 defines += [ |
135 # NOTICE: Since common_inherited_config is used in public_configs for our | 139 # NOTICE: Since common_inherited_config is used in public_configs for our |
136 # targets, there's no point including the defines in that config here. | 140 # targets, there's no point including the defines in that config here. |
137 # TODO(kjellander): Cleanup unused ones and move defines closer to the | 141 # TODO(kjellander): Cleanup unused ones and move defines closer to the |
138 # source when webrtc:4256 is completed. | 142 # source when webrtc:4256 is completed. |
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
513 ] | 517 ] |
514 | 518 |
515 deps = [ | 519 deps = [ |
516 "//base:base_java_test_support", | 520 "//base:base_java_test_support", |
517 "//webrtc/examples:AppRTCMobile_javalib", | 521 "//webrtc/examples:AppRTCMobile_javalib", |
518 "//webrtc/sdk/android:libjingle_peerconnection_java", | 522 "//webrtc/sdk/android:libjingle_peerconnection_java", |
519 ] | 523 ] |
520 } | 524 } |
521 } | 525 } |
522 } | 526 } |
OLD | NEW |