Merge "Switch to clang-r339409."

This commit is contained in:
Stephen Hines
2018-10-01 15:57:35 +00:00
committed by Gerrit Code Review
3 changed files with 16 additions and 4 deletions

View File

@@ -178,6 +178,18 @@ func init() {
// Disable c++98-specific warning since Android is not concerned with C++98
// compatibility.
"-Wno-c++98-compat-extra-semi",
// Disable this warning until we can fix all instances where it fails.
"-Wno-self-assign-overloaded",
// Disable this warning until we can fix all instances where it fails.
"-Wno-constant-logical-operand",
// Disable this warning because we don't care about behavior with older compilers.
"-Wno-return-std-move-in-c++11",
// Disable this warning until we can fix all instances where it fails.
"-Wno-dangling-field",
}, " "))
// Extra cflags for projects under external/ directory to disable warnings that are infeasible

View File

@@ -126,8 +126,8 @@ var (
// prebuilts/clang default settings.
ClangDefaultBase = "prebuilts/clang/host"
ClangDefaultVersion = "clang-r328903"
ClangDefaultShortVersion = "7.0.2"
ClangDefaultVersion = "clang-r339409"
ClangDefaultShortVersion = "8.0.1"
// Directories with warnings from Android.bp files.
WarningAllowedProjects = []string{

View File

@@ -54,7 +54,7 @@ do_strip() {
# ${CROSS_COMPILE}strip --strip-all does not strip .ARM.attributes,
# so we tell llvm-strip to keep it too.
if [ ! -z "${use_llvm_strip}" ]; then
"${CLANG_BIN}/llvm-strip" --strip-all -keep=.ARM.attributes "${infile}" "${outfile}.tmp"
"${CLANG_BIN}/llvm-strip" --strip-all -keep=.ARM.attributes "${infile}" -o "${outfile}.tmp"
else
"${CROSS_COMPILE}strip" --strip-all "${infile}" -o "${outfile}.tmp"
fi
@@ -75,7 +75,7 @@ do_strip_keep_mini_debug_info() {
rm -f "${outfile}.dynsyms" "${outfile}.funcsyms" "${outfile}.keep_symbols" "${outfile}.debug" "${outfile}.mini_debuginfo" "${outfile}.mini_debuginfo.xz"
local fail=
if [ ! -z "${use_llvm_strip}" ]; then
"${CLANG_BIN}/llvm-strip" --strip-all -keep=.ARM.attributes -remove-section=.comment "${infile}" "${outfile}.tmp" || fail=true
"${CLANG_BIN}/llvm-strip" --strip-all -keep=.ARM.attributes -remove-section=.comment "${infile}" -o "${outfile}.tmp" || fail=true
else
"${CROSS_COMPILE}strip" --strip-all -R .comment "${infile}" -o "${outfile}.tmp" || fail=true
fi