diff options
| author | 2025-03-17 11:02:03 -0700 | |
|---|---|---|
| committer | 2025-03-17 11:02:03 -0700 | |
| commit | abdf1eb1244249a552d785a0dcf065be1abd3c87 (patch) | |
| tree | 6abc78540ac0ca704adecd16b0d6e6f6943d6f01 | |
| parent | 3a25c05eb91fb15ac5dd542679f1bde5faf4b2db (diff) | |
| parent | e8031786ce3b58304fb00c1c04743953e8d77951 (diff) | |
Merge "Make object-size sanitizer on by default" into main am: 8b7a3b8087 am: e8031786ce
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3544565
Change-Id: I78fa3e481cdd9cb07f745b6b0dd5dc6c2c41cbea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | android/config.go | 5 | ||||
| -rw-r--r-- | cc/sanitize.go | 5 |
2 files changed, 1 insertions, 9 deletions
diff --git a/android/config.go b/android/config.go index ede2240ab..98a408b60 100644 --- a/android/config.go +++ b/android/config.go @@ -238,11 +238,6 @@ func (c Config) ReleaseAconfigFlagDefaultPermission() string { return c.config.productVariables.ReleaseAconfigFlagDefaultPermission } -// Enable object size sanitizer -func (c Config) ReleaseBuildObjectSizeSanitizer() bool { - return c.config.productVariables.GetBuildFlagBool("RELEASE_BUILD_OBJECT_SIZE_SANITIZER") -} - // The flag indicating behavior for the tree wrt building modules or using prebuilts // derived from RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE func (c Config) ReleaseDefaultModuleBuildFromSource() bool { 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...) } |