commit f359548bf1cf41e1f5390276e84e259cbbf30667
author George Burgess IV <gbiv@google.com> Thu Nov 07 07:07:38 2019 +0000
committer George Burgess IV <gbiv@google.com> Thu Nov 07 07:07:38 2019 +0000
tree a840aea69c0f9c489dcfbccd7cc8d09988684d2a
parent d7e11b88531665de59de466bbc9ee6c480b00a4f

Revert "fortify: allow diagnostics without run-time checks"

This reverts commit d7e11b88531665de59de466bbc9ee6c480b00a4f.

Reason for revert: Breaks aosp_x86_64-eng. Will look into it and
unbreak when it's not almost midnight. :)

Change-Id: I21f76efe4d19c70d0b14630e441376d359a45b49

libc/include/bits/fortify/stat.h

diff --git a/libc/include/bits/fortify/stat.h b/libc/include/bits/fortify/stat.h
index 43fc69c..6a2e822 100644
--- a/libc/include/bits/fortify/stat.h
+++ b/libc/include/bits/fortify/stat.h
@@ -41,11 +41,11 @@
     __overloadable
     __enable_if(1, "")
     __clang_error_if(mode & ~0777, "'umask' called with invalid mode") {
-#if __ANDROID_API__ >= __ANDROID_API_J_MR2__ && __BIONIC_FORTIFY_RUNTIME_CHECKS_ENABLED
+#if __ANDROID_API__ >= __ANDROID_API_J_MR2__
   return __umask_chk(mode);
 #else
   return __umask_real(mode);
-#endif
+#endif  /* __ANDROID_API__ >= __ANDROID_API_J_MR2__ */
 }
 
 #endif /* defined(__BIONIC_FORTIFY) */