From ae6ae1d880cf5bfca03e5f333c0b09fd138af433 Mon Sep 17 00:00:00 2001 From: Ivan Lozano Date: Mon, 8 Oct 2018 09:29:39 -0700 Subject: [PATCH] Apply minimal runtime to the rest of ubsan. Make sure that the minimal runtime gets applied to the rest of the sanitizers we might use from ubsan. Bug: 80195448 Test: Build success and checked build flags. Change-Id: I31b211b80bb1068c153a9b65454a2605933c9568 --- cc/sanitize.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cc/sanitize.go b/cc/sanitize.go index 5dcaf76c9..8262a6810 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -50,7 +50,8 @@ var ( hwasanStaticLibsMutex sync.Mutex intOverflowCflags = []string{"-fsanitize-blacklist=build/soong/cc/config/integer_overflow_blacklist.txt"} - minimalRuntimeFlags = []string{"-fsanitize-minimal-runtime", "-fno-sanitize-trap=integer", "-fno-sanitize-recover=integer"} + minimalRuntimeFlags = []string{"-fsanitize-minimal-runtime", "-fno-sanitize-trap=integer,undefined", + "-fno-sanitize-recover=integer,undefined"} ) type sanitizerType int