Merge "Revert "Revert "Added mitigation for b/122921367""" am: fcd2235d8a am: ad135159b4 am: 390cca1808 am: 3f908c7afb

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

Change-Id: I62fac79f1279c984d4762ffd75bdbebd4ca3542e
This commit is contained in:
Treehugger Robot
2020-11-18 12:02:09 +00:00
committed by Automerger Merge Worker

View File

@@ -14,6 +14,15 @@
* 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