Merge "Exclude watchdog_posix.cc in AOSP MAC builds"
diff --git a/.travis.yml b/.travis.yml
index fa3f349..9d3ab45 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -119,6 +119,7 @@
- buildtools/googletest
- buildtools/jsoncpp
- buildtools/libbacktrace
+ - buildtools/linenoise
- buildtools/libcxx
- buildtools/libcxxabi
- buildtools/libunwind
diff --git a/src/base/sock_utils.cc b/src/base/sock_utils.cc
index 2efdbe2..d643d8d 100644
--- a/src/base/sock_utils.cc
+++ b/src/base/sock_utils.cc
@@ -40,7 +40,9 @@
// The CMSG_* macros use NULL instead of nullptr.
#pragma GCC diagnostic push
+#if !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX)
#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif
ssize_t Send(int fd,
const void* msg,
diff --git a/tools/install-build-deps b/tools/install-build-deps
index d9512b5..9c394e0 100755
--- a/tools/install-build-deps
+++ b/tools/install-build-deps
@@ -179,10 +179,10 @@
'all',
),
- # Linenoise
+ # Linenoise, used only by trace_processor in standalone builds.
('buildtools/linenoise',
- 'https://github.com/antirez/linenoise.git',
- '4a961c0108720741e2683868eb10495f015ee422',
+ 'https://fuchsia.googlesource.com/third_party/linenoise.git',
+ 'c894b9e59f02203dbe4e2be657572cf88c4230c3',
'all'
),
]