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 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
124 if (rtc_enable_external_auth) { | 124 if (rtc_enable_external_auth) { |
125 defines += [ "ENABLE_EXTERNAL_AUTH" ] | 125 defines += [ "ENABLE_EXTERNAL_AUTH" ] |
126 } | 126 } |
127 | 127 |
128 if (build_with_chromium) { | 128 if (build_with_chromium) { |
129 defines += [ | 129 defines += [ |
130 # NOTICE: Since common_inherited_config is used in public_configs for our | 130 # NOTICE: Since common_inherited_config is used in public_configs for our |
131 # targets, there's no point including the defines in that config here. | 131 # targets, there's no point including the defines in that config here. |
132 # TODO(kjellander): Cleanup unused ones and move defines closer to the | 132 # TODO(kjellander): Cleanup unused ones and move defines closer to the |
133 # source when webrtc:4256 is completed. | 133 # source when webrtc:4256 is completed. |
134 "HAVE_SRTP", | |
135 "HAVE_WEBRTC_VIDEO", | 134 "HAVE_WEBRTC_VIDEO", |
136 "HAVE_WEBRTC_VOICE", | 135 "HAVE_WEBRTC_VOICE", |
137 "LOGGING_INSIDE_WEBRTC", | 136 "LOGGING_INSIDE_WEBRTC", |
138 "USE_WEBRTC_DEV_BRANCH", | 137 "USE_WEBRTC_DEV_BRANCH", |
139 ] | 138 ] |
140 } else { | 139 } else { |
141 if (is_posix) { | 140 if (is_posix) { |
142 # Enable more warnings: -Wextra is currently disabled in Chromium. | 141 # Enable more warnings: -Wextra is currently disabled in Chromium. |
143 cflags = [ | 142 cflags = [ |
144 "-Wextra", | 143 "-Wextra", |
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
512 ] | 511 ] |
513 | 512 |
514 deps = [ | 513 deps = [ |
515 "//base:base_java_test_support", | 514 "//base:base_java_test_support", |
516 "//webrtc/examples:AppRTCMobile_javalib", | 515 "//webrtc/examples:AppRTCMobile_javalib", |
517 "//webrtc/sdk/android:libjingle_peerconnection_java", | 516 "//webrtc/sdk/android:libjingle_peerconnection_java", |
518 ] | 517 ] |
519 } | 518 } |
520 } | 519 } |
521 } | 520 } |
OLD | NEW |