 Chromium Code Reviews
 Chromium Code Reviews Issue 2640513002:
  Relanding: Removing #defines previously used for building without BoringSSL/OpenSSL.  (Closed)
    
  
    Issue 2640513002:
  Relanding: Removing #defines previously used for building without BoringSSL/OpenSSL.  (Closed) 
  | 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", | |
| 34 "FEATURE_ENABLE_VOICEMAIL", | 33 "FEATURE_ENABLE_VOICEMAIL", | 
| 35 "EXPAT_RELATIVE_PATH", | 34 "EXPAT_RELATIVE_PATH", | 
| 36 "GTEST_RELATIVE_PATH", | 35 "GTEST_RELATIVE_PATH", | 
| 37 "NO_MAIN_THREAD_WRAPPING", | 36 "NO_MAIN_THREAD_WRAPPING", | 
| 38 "NO_SOUND_SYSTEM", | 37 "NO_SOUND_SYSTEM", | 
| 39 "WEBRTC_CHROMIUM_BUILD", | 38 "WEBRTC_CHROMIUM_BUILD", | 
| 40 ] | 39 ] | 
| 41 include_dirs = [ | 40 include_dirs = [ | 
| 42 # The overrides must be included first as that is the mechanism for | 41 # The overrides must be included first as that is the mechanism for | 
| 43 # selecting the override headers in Chromium. | 42 # selecting the override headers in Chromium. | 
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 125 if (rtc_enable_external_auth) { | 124 if (rtc_enable_external_auth) { | 
| 126 defines += [ "ENABLE_EXTERNAL_AUTH" ] | 125 defines += [ "ENABLE_EXTERNAL_AUTH" ] | 
| 127 } | 126 } | 
| 128 | 127 | 
| 129 if (build_with_chromium) { | 128 if (build_with_chromium) { | 
| 130 defines += [ | 129 defines += [ | 
| 131 # 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 | 
| 132 # 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. | 
| 133 # TODO(kjellander): Cleanup unused ones and move defines closer to the | 132 # TODO(kjellander): Cleanup unused ones and move defines closer to the | 
| 134 # source when webrtc:4256 is completed. | 133 # source when webrtc:4256 is completed. | 
| 135 "HAVE_OPENSSL_SSL_H", | |
| 
kjellander_webrtc
2017/01/20 07:33:52
This define is still mentioned in https://cs.chrom
 
Taylor Brandstetter
2017/01/20 18:26:15
It looks like localchanges.patch is dead, and just
 | |
| 136 "HAVE_SRTP", | 134 "HAVE_SRTP", | 
| 137 "HAVE_WEBRTC_VIDEO", | 135 "HAVE_WEBRTC_VIDEO", | 
| 138 "HAVE_WEBRTC_VOICE", | 136 "HAVE_WEBRTC_VOICE", | 
| 139 "LOGGING_INSIDE_WEBRTC", | 137 "LOGGING_INSIDE_WEBRTC", | 
| 140 "SSL_USE_OPENSSL", | |
| 
kjellander_webrtc
2017/01/20 07:33:52
Same as for HAVE_OPENSSL_SSL_H above.
 | |
| 141 "USE_WEBRTC_DEV_BRANCH", | 138 "USE_WEBRTC_DEV_BRANCH", | 
| 142 ] | 139 ] | 
| 143 } else { | 140 } else { | 
| 144 if (is_posix) { | 141 if (is_posix) { | 
| 145 # Enable more warnings: -Wextra is currently disabled in Chromium. | 142 # Enable more warnings: -Wextra is currently disabled in Chromium. | 
| 146 cflags = [ | 143 cflags = [ | 
| 147 "-Wextra", | 144 "-Wextra", | 
| 148 | 145 | 
| 149 # Repeat some flags that get overridden by -Wextra. | 146 # Repeat some flags that get overridden by -Wextra. | 
| 150 "-Wno-unused-parameter", | 147 "-Wno-unused-parameter", | 
| (...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 497 ] | 494 ] | 
| 498 | 495 | 
| 499 deps = [ | 496 deps = [ | 
| 500 "//base:base_java_test_support", | 497 "//base:base_java_test_support", | 
| 501 "//webrtc/examples:AppRTCMobile_javalib", | 498 "//webrtc/examples:AppRTCMobile_javalib", | 
| 502 "//webrtc/sdk/android:libjingle_peerconnection_java", | 499 "//webrtc/sdk/android:libjingle_peerconnection_java", | 
| 503 ] | 500 ] | 
| 504 } | 501 } | 
| 505 } | 502 } | 
| 506 } | 503 } | 
| OLD | NEW |