diff options
| author | 2019-01-23 17:37:57 -0800 | |
|---|---|---|
| committer | 2019-01-23 17:37:57 -0800 | |
| commit | b8fb174ffac6e859be8d67e94271eafca961d3f8 (patch) | |
| tree | b152fece9b1d4c53aeb2c4fc9a8c540a98bc5613 | |
| parent | b8f046ea4e0d9ee5018ada88b16a30f4b566aae3 (diff) | |
| parent | b9293d20d526a48da3e90d5dae2abed46a5b437f (diff) | |
Merge "Added mitigation for b/122921367" am: 80c398b74c
am: b9293d20d5
Change-Id: I22cefdd83cc27dcf6ba32c568e808450121969d6
| -rw-r--r-- | core/jni/com_android_internal_os_Zygote.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp index 691027dbf83d..827d13f3deb9 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp @@ -14,6 +14,15 @@ * 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" // sys/mount.h has to come before linux/fs.h due to redefinition of MS_RDONLY, MS_BIND, etc |