commit 492fdf40fe59d6bd0fd2ff0074e8f59c6ec5120e
author Sam Zackrisson <saza@webrtc.org> Fri Oct 25 08:45:58 2019
committer Commit Bot <commit-bot@chromium.org> Fri Oct 25 13:46:03 2019
tree 6a7a23e01f3de5b1ac7c496bae323ba2e2c7fa98
parent 1a61739122e5ef32a95293af17311705c9a14c8d

Make rtc_json poisonous in WebRTC

This does not help the attached bugs, but it does allow greater control
over what JSON code is running where. Long-term, the JSON library used
for parsing configuration should likely be a library already present
in Chromium builds, to avoid duplication. And if that happens, then
WebRTC bug 9804 may be passé.

Note that this CL also sorts our poisons alphabetically.

Bug: chromium:895814, webrtc:9804
Change-Id: I70c3efe05a0eba9212895407f73978d8216df920
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/158400
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Sam Zackrisson <saza@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29615}

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index a0eda8f..5cef130 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -711,8 +711,11 @@
 group("poison_audio_codecs") {
 }
 
-group("poison_software_video_codecs") {
+group("poison_default_task_queue") {
 }
 
-group("poison_default_task_queue") {
+group("poison_rtc_json") {
+}
+
+group("poison_software_video_codecs") {
 }

api/audio/BUILD.gn

diff --git a/api/audio/BUILD.gn b/api/audio/BUILD.gn
index bc68190..9ea145b 100644
--- a/api/audio/BUILD.gn
+++ b/api/audio/BUILD.gn
@@ -52,6 +52,7 @@
 
 rtc_library("aec3_config_json") {
   visibility = [ "*" ]
+  allow_poison = [ "rtc_json" ]
   sources = [
     "echo_canceller3_config_json.cc",
     "echo_canceller3_config_json.h",

rtc_base/BUILD.gn

diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index acd54b9..0115429 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -615,6 +615,7 @@
 
 rtc_library("rtc_json") {
   public_configs = [ ":rtc_json_suppressions" ]
+  poisonous = [ "rtc_json" ]
   defines = []
   sources = [
     "strings/json.cc",

webrtc.gni

diff --git a/webrtc.gni b/webrtc.gni
index 6033764..4e0f364 100644
--- a/webrtc.gni
+++ b/webrtc.gni
@@ -366,11 +366,14 @@
   # Encoders and decoders for specific audio codecs such as Opus and iSAC.
   "audio_codecs",
 
-  # Software video codecs (VP8 and VP9 through libvpx).
-  "software_video_codecs",
-
   # Default task queue implementation.
   "default_task_queue",
+
+  # JSON parsing should not be needed in the "slim and modular" WebRTC.
+  "rtc_json",
+
+  # Software video codecs (VP8 and VP9 through libvpx).
+  "software_video_codecs",
 ]
 
 absl_include_config = "//third_party/abseil-cpp:absl_include_config"