Make object-size sanitizer on by default

The RELEASE_BUILD_OBJECT_SIZE_SANITIZER flag is now ON on every branch.
Clean up the flagging logic.

Test: presubmit
Change-Id: Ia4c25cef6baa1283f6c38a486d20ec91f084ac45

1 files changed, 1 insertions, 4 deletions

diff --git a/cc/sanitize.go b/cc/sanitize.go
index b704ef4bf..f0b0308ae 100644
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -1422,6 +1422,7 @@ func sanitizerRuntimeMutator(mctx android.BottomUpMutatorContext) {
 				sanitizers = append(sanitizers,
 					"bool",
 					"integer-divide-by-zero",
+					"object-size",
 					"return",
 					"returns-nonnull-attribute",
 					"shift-exponent",
@@ -1438,10 +1439,6 @@ func sanitizerRuntimeMutator(mctx android.BottomUpMutatorContext) {
 					//"shift-base",
 					//"signed-integer-overflow",
 				)
-
-				if mctx.Config().ReleaseBuildObjectSizeSanitizer() {
-					sanitizers = append(sanitizers, "object-size")
-				}
 			}
 			sanitizers = append(sanitizers, sanProps.Misc_undefined...)
 		}