Commit d9e7d240 authored Jan 12, 2021 by Treehugger Robot Committed by Automerger Merge Worker Jan 12, 2021

Merge "Reland revert of "Added mitigation for b/122921367"""" am: 5be93c28...

Merge "Reland revert of "Added mitigation for b/122921367"""" am: 5be93c28 am: 333c5f63 am: 7c6dd474

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I39309c74c24e0a146d9dd6cd1350b68b460c4e12

core/jni/com_android_internal_os_Zygote.cpp

+0 −9

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