Commit ee85ac12 authored Nov 18, 2020 by Automerger Merge Worker

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

Merge "Merge "Revert "Added mitigation for b/122921367"" am: 8ffbbc69 am: 3d548ec5 am: dadf0a52" into rvc-qpr-dev-plus-aosp am: 09eee8d5

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

Change-Id: I0ed81607787934ddb4f5894302322642f1a3f59b

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