Merge remote-tracking branch 'origin/master' into releases/v26.x
Change-Id: I93ea808428f5c4cc73555bc4674fe597bdb91a0b
diff --git a/CHANGELOG b/CHANGELOG
index ef536b9..848eab5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,11 @@
*
+v26.1 - 2022-06-13:
+ Trace Processor:
+ * Fixed build failures on Windows.
+
+
v26.0 - 2022-06-13:
Tracing service and probes:
* Added wildcard (*) support when targeting processes by their command line
diff --git a/buildtools/BUILD.gn b/buildtools/BUILD.gn
index 48fa4d2..f232732 100644
--- a/buildtools/BUILD.gn
+++ b/buildtools/BUILD.gn
@@ -1076,9 +1076,6 @@
config("jsoncpp_config") {
visibility = _buildtools_visibility
cflags = [ "-DJSON_USE_EXCEPTION=0" ]
- if (!is_win) {
- cflags += [ "-Wno-deprecated-declarations" ]
- }
cflags += [
# Using -isystem instead of include_dirs (-I), so we don't need to suppress
# warnings coming from third-party headers. Doing so would mask warnings in
@@ -1086,6 +1083,13 @@
perfetto_isystem_cflag,
rebase_path("jsoncpp/include", root_build_dir),
]
+ if (!is_win) {
+ cflags += [ "-Wno-deprecated-declarations" ]
+ }
+ if (is_clang && is_win) {
+ # JSON uses __int64 which clang complains about unless we specify this flag.
+ cflags += [ "-Wno-language-extension-token" ]
+ }
}
source_set("jsoncpp") {
