Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I62df274d12168be1d1cf4cc40ead2a0f180f30f1
This commit is contained in:
Treehugger Robot
2020-11-18 11:29:22 +00:00
committed by Automerger Merge Worker
parent 4c7226a1a4 390cca1808
commit 3f908c7afb
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/jni/com_android_internal_os_Zygote.cpp
View File

@@ -14,6 +14,15 @@
* limitations under the License. * 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 LOG_TAG "Zygote"
#define ATRACE_TAG ATRACE_TAG_DALVIK #define ATRACE_TAG ATRACE_TAG_DALVIK