summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2021-12-15 07:18:31 -0800
committerLinux Build Service Account <lnxbuild@localhost>2021-12-15 07:18:31 -0800
commiteef951fd34d4a1de3950277dc5bc1ebae99c30fc (patch)
treed720d639c9ec3b858dbde16cff0a4697dc2707a8
parentd98dd11429f74dec0ff48ebfc16ca74daeea8a66 (diff)
parenta304267c3a39727257c0d7d42594526c4363c19c (diff)
Merge a304267c3a39727257c0d7d42594526c4363c19c on remote branch
Change-Id: I5ff5de9074705c683d568e9be1469af4702c9009
-rw-r--r--cc/sanitize.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/cc/sanitize.go b/cc/sanitize.go
index f7dc8a4a8..ec5ecff00 100644
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -732,8 +732,7 @@ func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags {
flags.Local.CFlags = append(flags.Local.CFlags, "-fno-sanitize=implicit-integer-sign-change")
}
// http://b/171275751, Android doesn't build with this sanitizer yet.
- // KEYSTONE(I31a5c1934a7faae000833f849a7c022b0e45a6f4,b/178857879)
- if toDisableUnsignedShiftBaseChange(flags.Local.CFlags) && !flags.Sdclang {
+ if toDisableUnsignedShiftBaseChange(flags.Local.CFlags) {
flags.Local.CFlags = append(flags.Local.CFlags, "-fno-sanitize=unsigned-shift-base")
}
}