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 12 matching lines...) Expand all Loading... |
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 (build_with_chromium) { | 29 if (build_with_chromium) { |
30 defines = [ | 30 defines = [ |
31 # TODO(kjellander): Cleanup unused ones and move defines closer to | 31 # TODO(kjellander): Cleanup unused ones and move defines closer to |
32 # the source when webrtc:4256 is completed. | 32 # the source when webrtc:4256 is completed. |
| 33 "FEATURE_ENABLE_SSL", |
33 "FEATURE_ENABLE_VOICEMAIL", | 34 "FEATURE_ENABLE_VOICEMAIL", |
34 "EXPAT_RELATIVE_PATH", | 35 "EXPAT_RELATIVE_PATH", |
35 "GTEST_RELATIVE_PATH", | 36 "GTEST_RELATIVE_PATH", |
36 "NO_MAIN_THREAD_WRAPPING", | 37 "NO_MAIN_THREAD_WRAPPING", |
37 "NO_SOUND_SYSTEM", | 38 "NO_SOUND_SYSTEM", |
38 "WEBRTC_CHROMIUM_BUILD", | 39 "WEBRTC_CHROMIUM_BUILD", |
39 ] | 40 ] |
40 include_dirs = [ | 41 include_dirs = [ |
41 # The overrides must be included first as that is the mechanism for | 42 # The overrides must be included first as that is the mechanism for |
42 # selecting the override headers in Chromium. | 43 # selecting the override headers in Chromium. |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
124 if (rtc_enable_external_auth) { | 125 if (rtc_enable_external_auth) { |
125 defines += [ "ENABLE_EXTERNAL_AUTH" ] | 126 defines += [ "ENABLE_EXTERNAL_AUTH" ] |
126 } | 127 } |
127 | 128 |
128 if (build_with_chromium) { | 129 if (build_with_chromium) { |
129 defines += [ | 130 defines += [ |
130 # NOTICE: Since common_inherited_config is used in public_configs for our | 131 # 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. | 132 # targets, there's no point including the defines in that config here. |
132 # TODO(kjellander): Cleanup unused ones and move defines closer to the | 133 # TODO(kjellander): Cleanup unused ones and move defines closer to the |
133 # source when webrtc:4256 is completed. | 134 # source when webrtc:4256 is completed. |
| 135 "HAVE_OPENSSL_SSL_H", |
134 "HAVE_SRTP", | 136 "HAVE_SRTP", |
135 "HAVE_WEBRTC_VIDEO", | 137 "HAVE_WEBRTC_VIDEO", |
136 "HAVE_WEBRTC_VOICE", | 138 "HAVE_WEBRTC_VOICE", |
137 "LOGGING_INSIDE_WEBRTC", | 139 "LOGGING_INSIDE_WEBRTC", |
| 140 "SSL_USE_OPENSSL", |
138 "USE_WEBRTC_DEV_BRANCH", | 141 "USE_WEBRTC_DEV_BRANCH", |
139 ] | 142 ] |
140 } else { | 143 } else { |
141 if (is_posix) { | 144 if (is_posix) { |
142 # Enable more warnings: -Wextra is currently disabled in Chromium. | 145 # Enable more warnings: -Wextra is currently disabled in Chromium. |
143 cflags = [ | 146 cflags = [ |
144 "-Wextra", | 147 "-Wextra", |
145 | 148 |
146 # Repeat some flags that get overridden by -Wextra. | 149 # Repeat some flags that get overridden by -Wextra. |
147 "-Wno-unused-parameter", | 150 "-Wno-unused-parameter", |
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
496 ] | 499 ] |
497 | 500 |
498 deps = [ | 501 deps = [ |
499 "//base:base_java_test_support", | 502 "//base:base_java_test_support", |
500 "//webrtc/examples:AppRTCMobile_javalib", | 503 "//webrtc/examples:AppRTCMobile_javalib", |
501 "//webrtc/sdk/android:libjingle_peerconnection_java", | 504 "//webrtc/sdk/android:libjingle_peerconnection_java", |
502 ] | 505 ] |
503 } | 506 } |
504 } | 507 } |
505 } | 508 } |
OLD | NEW |