commit b9293d20d526a48da3e90d5dae2abed46a5b437f
author Christian Wailes <chriswailes@google.com> Wed Jan 23 17:26:10 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Jan 23 17:26:10 2019 -0800
tree ac78d526e8091b8e334fe28ed4b62bc2209bc8d7
parent 5adc8fa3e067b155ba1c1c9a93994c9e14c77cb0
parent 80c398b74c2ba085b80e04ac1bba9d16f48a8e1e

Merge "Added mitigation for b/122921367"
am: 80c398b74c

Change-Id: I29c437ba51ff3f4cc90671a0581f41a70581d5a8

core/jni/com_android_internal_os_Zygote.cpp

diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp
index 691027d..827d13f 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