Provide a copy of 'pthread_mutexattr_setprotocol' so that Android 8.1 can again be supported.

Closes #16

Author: CDrummond

android/app/build.gradle

@@ -4,11 +4,11 @@ android {
     defaultConfig {
         applicationId "org.lyrion.squeezelite"
         compileSdk 34
-        minSdkVersion 28
+        minSdkVersion 27
         targetSdkVersion 34
         buildToolsVersion = "34.0.0"
-        versionCode  700
-        versionName "0.7.0"
+        versionCode  701
+        versionName "0.7.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         ndkVersion "27.2.12479018"
         ndk {

android/meson.build

@@ -114,6 +114,7 @@ sources = [
     '../dop.c',
     '../dsd2pcm/dsd2pcm.c',
     'src/android.c',
+    'src/thread.c',
     'src/pa/os/unix/pa_unix_hostapis.c',
     'src/pa/os/unix/pa_pthread_util.c',
     'src/pa/os/unix/pa_unix_util.c',

android/src/thread.c

@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <pthread.h>
+#include <errno.h>
+
+#define MUTEXATTR_PROTOCOL_MASK 0x0020
+#define MUTEXATTR_PROTOCOL_SHIFT 5
+
+/**
+This code is a copy of pthread_mutexattr_setprotocol from:
+   https://android.googlesource.com/platform/bionic/+/master/libc/bionic/pthread_mutex.cpp
+...as such the license of this is as above.
+
+This is coped here so that Android 8.1 can be supported.
+*/
+int pthread_mutexattr_setprotocol_squeezelite(pthread_mutexattr_t* attr, int protocol) {
+    if (protocol != PTHREAD_PRIO_NONE && protocol != PTHREAD_PRIO_INHERIT) {
+        return EINVAL;
+    }
+    *attr = (*attr & ~MUTEXATTR_PROTOCOL_MASK) | (protocol << MUTEXATTR_PROTOCOL_SHIFT);
+    return 0;
+}

fastlane/metadata/android/en-US/changelogs/700.txt

@@ -3,4 +3,3 @@
 • Add option to control stopping of player when powered off.
 • Fix handling of media keys.
 • Add option to delay start on boot by 5, 10, 20, or 30 seconds.
-• New icon.

fastlane/metadata/android/en-US/changelogs/701.txt

@@ -0,0 +1,2 @@
+• New icon.
+• Provide a copy of 'pthread_mutexattr_setprotocol' so that Android 8.1 can again be supported.

squeezelite.h

@@ -335,7 +335,14 @@ typedef int64_t   s64_t;
 
 #define mutex_type pthread_mutex_t
 #define mutex_create(m) pthread_mutex_init(&m, NULL)
+
+#ifdef ANDROID
+extern int pthread_mutexattr_setprotocol_squeezelite(pthread_mutexattr_t* attr, int protocol);
+#define mutex_create_p(m) pthread_mutexattr_t attr; pthread_mutexattr_init(&attr); pthread_mutexattr_setprotocol_squeezelite(&attr, PTHREAD_PRIO_INHERIT); pthread_mutex_init(&m, &attr); pthread_mutexattr_destroy(&attr)
+#else
 #define mutex_create_p(m) pthread_mutexattr_t attr; pthread_mutexattr_init(&attr); pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT); pthread_mutex_init(&m, &attr); pthread_mutexattr_destroy(&attr)
+#endif
+
 #define mutex_lock(m) pthread_mutex_lock(&m)
 #define mutex_unlock(m) pthread_mutex_unlock(&m)
 #define mutex_destroy(m) pthread_mutex_destroy(&m)