Rename __ANDROID_UNGUARDED_AVAILABILITY__ -> __ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__.
Also reduce some of the duplication in the macros.
Bug: http://b/179067538
Test: treehugger
Change-Id: I81ab341731b0faad6c7c5f00037feff8576abafb
diff --git a/libc/include/android/legacy_signal_inlines.h b/libc/include/android/legacy_signal_inlines.h
index e968c45..95c2320 100644
--- a/libc/include/android/legacy_signal_inlines.h
+++ b/libc/include/android/legacy_signal_inlines.h
@@ -50,7 +50,7 @@
* can't use __builtin_available, but the platform builds with -Werror=unguarded-availability so
* it requires __builtin_available.
*/
-#if defined(__ANDROID_UNGUARDED_AVAILABILITY__)
+#if defined(__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__)
if (__builtin_available(android 21, *)) {
#else
if (__libc_current_sigrtmax) {
@@ -66,7 +66,7 @@
* can't use __builtin_available, but the platform builds with -Werror=unguarded-availability so
* it requires __builtin_available.
*/
-#if defined(__ANDROID_UNGUARDED_AVAILABILITY__)
+#if defined(__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__)
if (__builtin_available(android 21, *)) {
#else
if (__libc_current_sigrtmin) {