Merge "Revert "Revert "Added mitigation for b/122921367"""

2020-11-18 10:20:41 +00:00
parent 6f7c5e0914 08ba820d9e
commit fcd2235d8a
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"
 #define ATRACE_TAG ATRACE_TAG_DALVIK