Merge "Reland revert of "Added mitigation for b/122921367"""" am: 5be93c2823 am: 333c5f633f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546309 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id9cbc5ee29e82a28d1a26d6d14e5c342c6d65136
This commit is contained in:
@@ -14,15 +14,6 @@
|
|||||||
* 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
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user