Merge "Reland revert of "Added mitigation for b/122921367"""" am: 5be93c2823 am: 333c5f633f am: 7c6dd474c4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546309

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I39309c74c24e0a146d9dd6cd1350b68b460c4e12
This commit is contained in:
Treehugger Robot
2021-01-12 21:05:30 +00:00
committed by Automerger Merge Worker

View File

@@ -14,15 +14,6 @@
* limitations under the License.
*/
/*
* Disable optimization of this file if we are compiling with the address
* sanitizer. This is a mitigation for b/122921367 and can be removed once the
* bug is fixed.
*/
#if __has_feature(address_sanitizer)
#pragma clang optimize off
#endif
#define LOG_TAG "Zygote"
#define ATRACE_TAG ATRACE_TAG_DALVIK