diff options
| author | Weilun Du <wdu@google.com> | 2022-08-02 18:19:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-08-02 18:19:31 +0000 |
| commit | b5a6c09e477414eb7f90cddb24ff0681946044e3 (patch) | |
| tree | 6eacaffe4bebf8e00c290c1e1839e084b0c52e88 | |
| parent | 9441852215d986463bfd940aa5a9bec4b50e58a4 (diff) | |
| parent | f4be610c042a74d94bca450a2917001bd91f8f9c (diff) | |
| download | webrtc-emu-32-release.tar.gz | |
Merge "Revert "[emulator-webrtc] Unblock build from source on MSVC"" into emu-master-devemu-32-releaseemu-32-dev
| -rw-r--r-- | rtc_base/strings/json.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/rtc_base/strings/json.h b/rtc_base/strings/json.h index 69262e9fd8..0cb9542c7f 100644 --- a/rtc_base/strings/json.h +++ b/rtc_base/strings/json.h @@ -14,7 +14,11 @@ #include <string> #include <vector> +#if !defined(WEBRTC_EXTERNAL_JSON) #include "json/json.h" +#else +#include "third_party/jsoncpp/json.h" +#endif namespace rtc { |