commit f6ae20842de972d297270e7a145ec4b178586d50
parent a1a64338fcdb073decb932cd7cf22ee80546e628
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date: Sat, 18 Oct 2025 00:53:10 +0000
Bug 1991644 - Set the minimum Android version to 26 for LLVM & NDK. r=glandium
Differential Revision: https://phabricator.services.mozilla.com/D268815
Diffstat:
4 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/build/moz.configure/android-ndk.configure b/build/moz.configure/android-ndk.configure
@@ -35,8 +35,8 @@ option(
@dependable
def min_android_version():
- # Sync with android_sdk_version
- return "21"
+ # Sync with android_sdk_version.min_sdk_version
+ return "26"
option(
diff --git a/memory/replace/logalloc/replay/Replay.cpp b/memory/replace/logalloc/replay/Replay.cpp
@@ -381,17 +381,6 @@ MOZ_BEGIN_EXTERN_C
#define MALLOC_FUNCS MALLOC_FUNCS_JEMALLOC
#include "malloc_decls.h"
-#ifdef ANDROID
-
-/* mozjemalloc and jemalloc use pthread_atfork, which Android doesn't have.
- * While gecko has one in libmozglue, the replay program can't use that.
- * Since we're not going to fork anyways, make it a dummy function. */
-int pthread_atfork(void (*aPrepare)(void), void (*aParent)(void),
- void (*aChild)(void)) {
- return 0;
-}
-#endif
-
MOZ_END_EXTERN_C
template <unsigned Base = 10>
diff --git a/mozglue/static/moz.build b/mozglue/static/moz.build
@@ -7,6 +7,8 @@
EXPORTS.mozilla = ["Compression.h"]
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "android":
+ OS_LIBS += ["android"]
+
EXPORTS.mozilla += ["android/Ashmem.h"]
UNIFIED_SOURCES += [
diff --git a/taskcluster/scripts/misc/build-llvm-common.sh b/taskcluster/scripts/misc/build-llvm-common.sh
@@ -69,7 +69,8 @@ case "$target" in
arch=${target%-linux-android}
;;
esac
- api_level=21
+ # Keep this in sync with min_android_version in android-ndk.configure.
+ api_level=26
target=$target$api_level
# These flags are only necessary to pass the cmake tests. They don't end up
# actually using libgcc, so use an empty library instead of trying to find
