Merge "Factor out common include directories into helper"
diff --git a/core/Makefile b/core/Makefile
index cdf24dd..c86c499 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1615,7 +1615,7 @@
$(HOST_LIBRARY_PATH)/libbrillo-http$(HOST_SHLIB_SUFFIX) \
$(HOST_LIBRARY_PATH)/libchrome$(HOST_SHLIB_SUFFIX) \
$(HOST_LIBRARY_PATH)/libcurl-host$(HOST_SHLIB_SUFFIX) \
- $(HOST_LIBRARY_PATH)/libevent-host$(HOST_SHLIB_SUFFIX) \
+ $(HOST_LIBRARY_PATH)/libevent$(HOST_SHLIB_SUFFIX) \
$(HOST_LIBRARY_PATH)/libprotobuf-cpp-lite$(HOST_SHLIB_SUFFIX) \
$(HOST_LIBRARY_PATH)/libssl-host$(HOST_SHLIB_SUFFIX) \
$(HOST_LIBRARY_PATH)/libz-host$(HOST_SHLIB_SUFFIX) \
diff --git a/core/clang/versions.mk b/core/clang/versions.mk
index ef28880..5988eff 100644
--- a/core/clang/versions.mk
+++ b/core/clang/versions.mk
@@ -1,5 +1,5 @@
## Clang/LLVM release versions.
LLVM_RELEASE_VERSION := 3.8
-LLVM_PREBUILTS_VERSION ?= clang-2812033
+LLVM_PREBUILTS_VERSION ?= clang-3016494
LLVM_PREBUILTS_BASE ?= prebuilts/clang/host
diff --git a/core/config.mk b/core/config.mk
index d497dbb..0699a14 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -645,8 +645,10 @@
GLOBAL_CLANG_CFLAGS_NO_OVERRIDE := \
-Werror=address-of-temporary \
- -Werror=null-dereference \
-Werror=return-type \
+ # Bug: http://b/29823425 Disable -Wnull-dereference until the new cases
+ # detected by this warning in Clang r271374 are fixed.
+ #-Werror=null-dereference \
GLOBAL_CPPFLAGS_NO_OVERRIDE :=
diff --git a/core/goma.mk b/core/goma.mk
index 0d5f428..c0c27c5 100644
--- a/core/goma.mk
+++ b/core/goma.mk
@@ -46,7 +46,7 @@
# gomacc can start goma client's daemon process automatically, but
# it is safer and faster to start up it beforehand. We run this as a
# background process so this won't slow down the build.
- $(shell ( GOMA_HERMETIC=error $(goma_ctl) ensure_start ) &> /dev/null &)
+ $(shell ( $(goma_ctl) ensure_start ) &> /dev/null &)
goma_ctl :=
goma_dir :=
diff --git a/tools/warn.py b/tools/warn.py
index 6324429..c944fb6 100755
--- a/tools/warn.py
+++ b/tools/warn.py
@@ -1977,15 +1977,15 @@
compilepatterns()
# read the log file and classify all the warnings
-lastmatchedline = ''
+warninglines = set()
for line in infile:
# replace fancy quotes with plain ol' quotes
line = line.replace("‘", "'");
line = line.replace("’", "'");
if warningpattern.match(line):
- if line != lastmatchedline:
+ if line not in warninglines:
classifywarning(line)
- lastmatchedline = line
+ warninglines.add(line)
else:
# save a little bit of time by only doing this for the first few lines
if linecounter < 50: