Switch to clang-r349610
Bug: http://b/122481018 The '-keep' option of llvm-strip has changed to '-keep-section'. Update scripts/strip.sh accordingly. Test: Tested on various targets in AOSP and internal branch. Googlers see http://go/clang-r349610-testing Change-Id: Ibfc97ecdcdc305c97a4169cead1e1e3cddda9c4c
This commit is contained in:
parent
05f9055505
commit
03b58e2210
2 changed files with 4 additions and 4 deletions
|
@ -120,8 +120,8 @@ var (
|
|||
|
||||
// prebuilts/clang default settings.
|
||||
ClangDefaultBase = "prebuilts/clang/host"
|
||||
ClangDefaultVersion = "clang-r346389c"
|
||||
ClangDefaultShortVersion = "8.0.7"
|
||||
ClangDefaultVersion = "clang-r349610"
|
||||
ClangDefaultShortVersion = "8.0.8"
|
||||
|
||||
// Directories with warnings from Android.bp files.
|
||||
WarningAllowedProjects = []string{
|
||||
|
|
|
@ -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}" -o "${outfile}.tmp"
|
||||
"${CLANG_BIN}/llvm-strip" --strip-all -keep-section=.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}" -o "${outfile}.tmp" || fail=true
|
||||
"${CLANG_BIN}/llvm-strip" --strip-all -keep-section=.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
|
||||
|
|
Loading…
Reference in a new issue