commit e62be7eea5cdf40e5f4417173f1acf8ce98bf0a0
author Elliott Hughes <enh@google.com> Fri Jan 14 19:45:54 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 14 19:45:54 2022 +0000
tree 7bab4ca910127fec826673d8d1648380cdc0ea97
parent 4a85b045fd6c218141d55b9dd44ec5220ba0b674
parent 1ff7be0713f25a6dae81303acceddfc82e1c835e

Merge "Don't use LLVM when readelf(1) will do."

libc/include/android/versioning.h

diff --git a/libc/include/android/versioning.h b/libc/include/android/versioning.h
index 214acf2..efe4354 100644
--- a/libc/include/android/versioning.h
+++ b/libc/include/android/versioning.h
@@ -51,7 +51,7 @@
 // those APIs will still cause a link error.
 #if defined(__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__)
 #define __BIONIC_AVAILABILITY(__what) __attribute__((__availability__(android,__what)))
-#define __INTRODUCED_IN_NO_GUARD_FOR_NDK(api_level) __INTRODUCED_IN_X86(api_level)
+#define __INTRODUCED_IN_NO_GUARD_FOR_NDK(api_level) __INTRODUCED_IN(api_level)
 #define __INTRODUCED_IN_X86_NO_GUARD_FOR_NDK(api_level) __INTRODUCED_IN_X86(api_level)
 #else
 #define __BIONIC_AVAILABILITY(__what) __attribute__((__availability__(android,strict,__what)))

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index b6d7774..19d18ab 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -741,7 +741,6 @@
     name: "libBionicLoaderTests",
     defaults: [
         "bionic_tests_defaults",
-        "llvm-defaults",
     ],
     srcs: [
         "atexit_test.cpp",