commit a7087e37f1342f8c21625a67f2382a53df4a9105
author Benjamin Wright <benwright@webrtc.org> Tue May 29 17:46:04 2018 -0700
committer Commit Bot <commit-bot@chromium.org> Fri Jun 01 18:42:27 2018 +0000
tree 68883da5ebad5ff2006600d6201206f396186212
parent 28deb90728c06a35d8847d2aeda2fc1aee105c5e

Unify the build define to enable or disable built in ssl root certificates.

The current approach for enabling or disabling built in ssl root certificates
was a bit confusing. This changeset unifies everything to a common define.

Bug: webrtc:9332
Change-Id: I7a0c18410d05df4b786741c3b9196d97fbb8d7b6
Reviewed-on: https://webrtc-review.googlesource.com/79746
Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
Commit-Queue: Benjamin Wright <benwright@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23495}

rtc_base/BUILD.gn

diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index b9cf3b9..b49d00a 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -874,7 +874,7 @@
   }
 
   if (rtc_builtin_ssl_root_certificates) {
-    defines += [ "WEBRTC_ENABLE_BUILT_IN_SSL_ROOT_CERTIFICATES" ]
+    defines += [ "WEBRTC_BUILT_IN_SSL_ROOT_CERTIFICATES" ]
   }
 
   if (is_android) {
@@ -1305,9 +1305,8 @@
     } else {
       configs += [ ":external_ssl_library" ]
     }
-
-    if (!rtc_builtin_ssl_root_certificates) {
-      defines += [ "WEBRTC_DISABLE_BUILT_IN_SSL_ROOT_CERTIFICATES" ]
+    if (rtc_builtin_ssl_root_certificates) {
+      defines += [ "WEBRTC_BUILT_IN_SSL_ROOT_CERTIFICATES" ]
     }
   }
 }