StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Switch to clang-r339409."

Browse Source 
am: ee15f2a7c7

Change-Id: Ic7de9d629900ce71315029a82f32a89a11c730be
This commit is contained in:
Stephen Hines
2018-10-01 09:20:41 -07:00
committed by android-build-merger
parent 80ae13c628 ee15f2a7c7
commit f4fe6300e6
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cc/config/clang.go
View File

@@ -183,6 +183,18 @@ func init() {
// Disable c++98-specific warning since Android is not concerned with C++98 // Disable c++98-specific warning since Android is not concerned with C++98
// compatibility. // compatibility.
"-Wno-c++98-compat-extra-semi", "-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 // Extra cflags for projects under external/ directory

4
cc/config/global.go
View File

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

4
scripts/strip.sh
View File

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