Initial commit, syncing up to v115

patches/platform_bionic/0001-Implement-per-process-target-SDK-version-override.patch

@@ -0,0 +1,39 @@
+From 797014d839df40582233e5f13c0fed93c3c178be Mon Sep 17 00:00:00 2001
+From: Danny Baumann <dannybaumann@web.de>
+Date: Wed, 29 Aug 2018 11:21:52 +0200
+Subject: [PATCH 1/4] Implement per-process target SDK version override.
+
+Change-Id: I65bbdbe96541d8aacdd4de125cdb9c1435129413
+
+This is only partial cherry-pick. Value won't be set via Android.bp
+---
+ linker/linker.cpp | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/linker/linker.cpp b/linker/linker.cpp
+index c78b9aba6..0ce60dfb2 100644
+--- a/linker/linker.cpp
++++ b/linker/linker.cpp
+@@ -3860,7 +3860,18 @@ std::vector<android_namespace_t*> init_default_namespaces(const char* executable
+     // somain and ld_preloads are added to these namespaces after LD_PRELOAD libs are linked
+   }
+ 
+-  set_application_target_sdk_version(config->target_sdk_version());
++  uint32_t target_sdk = config->target_sdk_version();
++#ifdef SDK_VERSION_OVERRIDES
++  for (const auto& entry : android::base::Split(SDK_VERSION_OVERRIDES, " ")) {
++    auto splitted = android::base::Split(entry, "=");
++    if (splitted.size() == 2 && splitted[0] == executable_path) {
++      target_sdk = static_cast<uint32_t>(std::stoul(splitted[1]));
++      break;
++    }
++  }
++  DEBUG("Target SDK for %s = %d", executable_path, target_sdk);
++#endif
++  set_application_target_sdk_version(target_sdk);
+ 
+   std::vector<android_namespace_t*> created_namespaces;
+   created_namespaces.reserve(namespaces.size());
+-- 
+2.17.1
+

patches/platform_bionic/0002-Actually-restore-pre-P-mutex-behavior.patch

@@ -0,0 +1,56 @@
+From 41b7ba117ad6ecf8080ecd3f8de5fee3e4cdb9d9 Mon Sep 17 00:00:00 2001
+From: Ethan Chen <intervigil@gmail.com>
+Date: Tue, 25 Sep 2018 00:11:05 -0700
+Subject: [PATCH 2/4] Actually restore pre-P mutex behavior
+
+Apps built against versions < P may not actually expect the EBUSY return
+code, and may crash or otherwise misbehave. Check for target SDK
+versions earlier than P when performing the IsMutexDestroyed check so
+any invocation of HandleUsingDestroyedMutex is bypassed and pre-P mutex
+behavior is restored.
+
+See 9e989f12d1186231d97dac6d038db7955acebdf3 for the change that
+introduced this new behavior.
+
+Change-Id: I45f8882c9527c63eed1ef5820a5004b8958d58ea
+---
+ libc/bionic/pthread_mutex.cpp | 19 ++++++++++++-------
+ 1 file changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/libc/bionic/pthread_mutex.cpp b/libc/bionic/pthread_mutex.cpp
+index 7f48972b1..9355a6030 100644
+--- a/libc/bionic/pthread_mutex.cpp
++++ b/libc/bionic/pthread_mutex.cpp
+@@ -781,17 +781,22 @@ static int MutexLockWithTimeout(pthread_mutex_internal_t* mutex, bool use_realti
+ 
+ }  // namespace NonPI
+ 
+-static inline __always_inline bool IsMutexDestroyed(uint16_t mutex_state) {
+-    return mutex_state == 0xffff;
+-}
+-
+ // Inlining this function in pthread_mutex_lock() adds the cost of stack frame instructions on
+ // ARM64. So make it noinline.
+-static int __attribute__((noinline)) HandleUsingDestroyedMutex(pthread_mutex_t* mutex,
+-                                                               const char* function_name) {
++static inline __attribute__((noinline)) bool IsMutexDestroyed(uint16_t mutex_state) {
++    // Checking for mutex destruction is a P-specific behavior. Bypass the
++    // check if the SDK version precedes P, so that no change in behavior
++    // that may cause crashes is introduced.
+     if (bionic_get_application_target_sdk_version() >= __ANDROID_API_P__) {
+-        __fortify_fatal("%s called on a destroyed mutex (%p)", function_name, mutex);
++        return mutex_state == 0xffff;
++    } else {
++        return false;
+     }
++}
++
++static int __always_inline HandleUsingDestroyedMutex(pthread_mutex_t* mutex,
++                                                               const char* function_name) {
++    __fortify_fatal("%s called on a destroyed mutex (%p)", function_name, mutex);
+     return EBUSY;
+ }
+ 
+-- 
+2.17.1
+

patches/platform_bionic/0003-bionic-Use-legacy-pthread_mutex_init-behavior-on-pre.patch

@@ -0,0 +1,33 @@
+From 520a3bdfe3f5918880bbf6d0c190229ec84e173d Mon Sep 17 00:00:00 2001
+From: nx111 <gd.zhangdz@gmail.com>
+Date: Wed, 3 Oct 2018 16:58:19 +0800
+Subject: [PATCH 3/4] bionic: Use legacy pthread_mutex_init() behavior on pre-P
+ API levels
+
+* Google's changes to pthread_mutex_init is breaking RIL
+  on certain Samsung devices like klte and hlte
+* To resolve this, add a check for their new additions
+  to only apply the new behavior for P and higher APIs
+
+Change-Id: I41335c5c436fa28a66d044e6634466556dfd7f95
+---
+ libc/bionic/pthread_mutex.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libc/bionic/pthread_mutex.cpp b/libc/bionic/pthread_mutex.cpp
+index 9355a6030..517e52688 100644
+--- a/libc/bionic/pthread_mutex.cpp
++++ b/libc/bionic/pthread_mutex.cpp
+@@ -526,7 +526,8 @@ int pthread_mutex_init(pthread_mutex_t* mutex_interface, const pthread_mutexattr
+         return EINVAL;
+     }
+ 
+-    if (((*attr & MUTEXATTR_PROTOCOL_MASK) >> MUTEXATTR_PROTOCOL_SHIFT) == PTHREAD_PRIO_INHERIT) {
++    if (((*attr & MUTEXATTR_PROTOCOL_MASK) >> MUTEXATTR_PROTOCOL_SHIFT) == PTHREAD_PRIO_INHERIT
++            && bionic_get_application_target_sdk_version() >= __ANDROID_API_P__) {
+ #if !defined(__LP64__)
+         if (state & MUTEX_SHARED_MASK) {
+             return EINVAL;
+-- 
+2.17.1
+

patches/platform_bionic/0004-Read-SDK-version-override-from-property.patch

@@ -0,0 +1,37 @@
+From 3809fd785286428028b76bc19e6ed6797b7ca81f Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Thu, 3 Jan 2019 17:50:03 +0100
+Subject: [PATCH 4/4] Read SDK version override from property
+
+Change-Id: I88ca5d0bde15ee4f2b2bd1255e98f9592973dbf9
+---
+ linker/linker.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/linker/linker.cpp b/linker/linker.cpp
+index 0ce60dfb2..f8c692cf7 100644
+--- a/linker/linker.cpp
++++ b/linker/linker.cpp
+@@ -3861,7 +3861,9 @@ std::vector<android_namespace_t*> init_default_namespaces(const char* executable
+   }
+ 
+   uint32_t target_sdk = config->target_sdk_version();
+-#ifdef SDK_VERSION_OVERRIDES
++
++  std::string sdkVersionOverrides = android::base::GetProperty("persist.sys.phh.sdk_override", "");
++  static const char *SDK_VERSION_OVERRIDES = sdkVersionOverrides.c_str();
+   for (const auto& entry : android::base::Split(SDK_VERSION_OVERRIDES, " ")) {
+     auto splitted = android::base::Split(entry, "=");
+     if (splitted.size() == 2 && splitted[0] == executable_path) {
+@@ -3870,7 +3872,7 @@ std::vector<android_namespace_t*> init_default_namespaces(const char* executable
+     }
+   }
+   DEBUG("Target SDK for %s = %d", executable_path, target_sdk);
+-#endif
++
+   set_application_target_sdk_version(target_sdk);
+ 
+   std::vector<android_namespace_t*> created_namespaces;
+-- 
+2.17.1
+