Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30f16caf authored by Chris Wailes's avatar Chris Wailes
Browse files

Added mitigation for b/122921367 

Without this patch aosp/870566 will cause clang to abort during x86-eng
asan builds (due to b/122921367).  This is being committed separately to
enable easy reversion in the future.

Test: m
Bug: 122921367
Change-Id: Id38a6ccabdcd0da02a53e76c47850e197016e781
Merged-In: Id38a6ccabdcd0da02a53e76c47850e197016e781
parent 0bab727d

core/jni/com_android_internal_os_Zygote.cpp

+9 −0
Original line number Diff line number Diff line
@@ -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