Commit 53bb3cf0 authored Nov 18, 2020 by Treehugger Robot Committed by Automerger Merge Worker Nov 18, 2020

Merge "Revert "Revert "Added mitigation for b/122921367""" am: fcd2235d am:...

Merge "Revert "Revert "Added mitigation for b/122921367""" am: fcd2235d am: ad135159 am: 390cca18 am: 3f908c7a

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

Change-Id: I62fac79f1279c984d4762ffd75bdbebd4ca3542e

core/jni/com_android_internal_os_Zygote.cpp

+9 −0

Original line number	Diff line number	Diff line
		@@ -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