diff options
| author | 2020-11-18 04:00:26 +0000 | |
|---|---|---|
| committer | 2020-11-18 04:00:26 +0000 | |
| commit | d49f702c4d2927d4e8c582d1439baf319c76c78f (patch) | |
| tree | 22265de7d599a2158a0c6ab467927a97c150f2a6 | |
| parent | f9f2634d3ae174eaa38cd90e196292549217f9e3 (diff) | |
| parent | dadf0a52aa2c954ec9f4ae9ebbe5971dffe1e214 (diff) | |
Merge "Revert "Added mitigation for b/122921367"" am: 8ffbbc6939 am: 3d548ec500 am: dadf0a52aa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1498166
Change-Id: Id8d281a9c21bbae441298c074e80d361d4749956
| -rw-r--r-- | core/jni/com_android_internal_os_Zygote.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp index 70c2afb74c72..61392d9af658 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp @@ -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 |