Merge "Reorder libc.llndk headers to match libc_headers_arch"
diff --git a/libc/Android.bp b/libc/Android.bp
index 365ad7b..9ffc4fe 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -89,6 +89,7 @@
header_libs: [
"libc_headers",
"gwp_asan_headers",
+ "liblog_headers", // needed by bionic/libc/async_safe/include
],
export_header_lib_headers: [
"libc_headers",
diff --git a/libc/bionic/pthread_create.cpp b/libc/bionic/pthread_create.cpp
index f3fee88..46d9e86 100644
--- a/libc/bionic/pthread_create.cpp
+++ b/libc/bionic/pthread_create.cpp
@@ -30,6 +30,7 @@
#include <errno.h>
#include <string.h>
+#include <sys/auxv.h>
#include <sys/mman.h>
#include <sys/prctl.h>
#include <sys/random.h>
@@ -346,7 +347,11 @@
__rt_sigprocmask(SIG_SETMASK, &thread->start_mask, nullptr, sizeof(thread->start_mask));
#ifdef __aarch64__
// Chrome's sandbox prevents this prctl, so only reset IA if the target SDK level is high enough.
- if (android_get_application_target_sdk_version() >= __ANDROID_API_S__) {
+ // Furthermore, processes loaded from vendor partitions may have their own sandboxes that would
+ // reject the prctl. Because no devices launched with PAC enabled before S, we can avoid issues on
+ // upgrading devices by checking for PAC support before issuing the prctl.
+ static const bool pac_supported = getauxval(AT_HWCAP) & HWCAP_PACA;
+ if (pac_supported && android_get_application_target_sdk_version() >= __ANDROID_API_S__) {
prctl(PR_PAC_RESET_KEYS, PR_PAC_APIAKEY, 0, 0, 0);
}
#endif