Merge "Switch to clang-r349610" am: 42b87a2e56
am: 8edd1c3632
Change-Id: I92713c576b5c9c9bf7ee16d0016c0f9aa495a3e7
This commit is contained in:
committed by
android-build-merger
commit
06b240368e
@@ -120,8 +120,8 @@ var (
|
|||||||
|
|
||||||
// prebuilts/clang default settings.
|
// prebuilts/clang default settings.
|
||||||
ClangDefaultBase = "prebuilts/clang/host"
|
ClangDefaultBase = "prebuilts/clang/host"
|
||||||
ClangDefaultVersion = "clang-r346389c"
|
ClangDefaultVersion = "clang-r349610"
|
||||||
ClangDefaultShortVersion = "8.0.7"
|
ClangDefaultShortVersion = "8.0.8"
|
||||||
|
|
||||||
// Directories with warnings from Android.bp files.
|
// Directories with warnings from Android.bp files.
|
||||||
WarningAllowedProjects = []string{
|
WarningAllowedProjects = []string{
|
||||||
|
@@ -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}" -o "${outfile}.tmp"
|
"${CLANG_BIN}/llvm-strip" --strip-all -keep-section=.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}" -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
|
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
|
||||||
|
Reference in New Issue
Block a user