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

am: b9293d20d5 Change-Id: I22cefdd83cc27dcf6ba32c568e808450121969d6
2019-01-23 17:37:57 -08:00
parent b8f046ea4e b9293d20d5
commit b8fb174ffa
1 changed files with 9 additions and 0 deletions
--- 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