config_host.mk.in | 1 -
configure.ac | 20 ++------------------
external/nss/ExternalProject_nss.mk | 2 +-
3 files changed, 3 insertions(+), 20 deletions(-)
New commits:
commit 1cd643693f04a8f1e9d58eab2e0d80f5e203bb05
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Tue Feb 18 20:24:55 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Feb 20 16:29:16 2025 +0100
drop obsolete android-gcc-toolchain switch
it had been deprecated since ndk 13 where it defaulted to clang already
and had been completely removed in ndk 18
nss still checks for it in the nss/coreconf/Linux.mk makefile, but the
paths it tries to set up there are unused/don't exist for a long while.
Change-Id: Ie37104ae59b2143ec4645af3ff437ad06792ee65
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181852
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/config_host.mk.in b/config_host.mk.in
index aa3b67e910d4..274e2759e186 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -23,7 +23,6 @@ export ANDROID_SDK_DIR=@ANDROID_SDK_DIR@
export ANDROID_SYSROOT_PLATFORM=@ANDROID_SYSROOT_PLATFORM@
export ANDROID_PACKAGE_NAME=@ANDROID_PACKAGE_NAME@
export ANDROID_TOOLCHAIN=@ANDROID_TOOLCHAIN@
-export ANDROID_GCC_TOOLCHAIN_VERSION=@ANDROID_GCC_TOOLCHAIN_VERSION@
export ANT=@ANT@
export ANT_HOME=@ANT_HOME@
export ANT_LIB=@ANT_LIB@
diff --git a/configure.ac b/configure.ac
index 3b29f6061ad8..352255fbbce6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -704,9 +704,8 @@ AC_ARG_ENABLE(fuzz-options,
)
dnl ===================================================================
-dnl When building for Android, --with-android-ndk,
-dnl --with-android-ndk-toolchain-version and --with-android-sdk are
-dnl mandatory
+dnl When building for Android, --with-android-ndk and
+dnl --with-android-sdk are mandatory
dnl ===================================================================
AC_ARG_WITH(android-ndk,
@@ -714,12 +713,6 @@ AC_ARG_WITH(android-ndk,
[Specify location of the Android Native Development Kit. Mandatory
when building for Android.]),
,)
-AC_ARG_WITH(android-ndk-toolchain-version,
- AS_HELP_STRING([--with-android-ndk-toolchain-version],
- [Specify which toolchain version to use, of those present in the
- Android NDK you are using. The default (and only supported version
currently) is "clang5.0"]),,
- with_android_ndk_toolchain_version=clang5.0)
-
AC_ARG_WITH(android-sdk,
AS_HELP_STRING([--with-android-sdk],
[Specify location of the Android SDK. Mandatory when building for
Android.]),
@@ -791,14 +784,6 @@ if test -n "$with_android_ndk"; then
;;
esac
- case "$with_android_ndk_toolchain_version" in
- clang5.0)
- ANDROID_GCC_TOOLCHAIN_VERSION=4.9
- ;;
- *)
- AC_MSG_ERROR([Unrecognized value for the
--with-android-ndk-toolchain-version option. Building for Android is only
supported with Clang 5.*])
- esac
-
AC_MSG_NOTICE([using the Android API level... $ANDROID_API_LEVEL])
# NDK 15 or later toolchain is 64bit-only, except for Windows that we
don't support. Using a 64-bit
@@ -851,7 +836,6 @@ AC_SUBST(ANDROID_NDK_DIR)
AC_SUBST(ANDROID_NDK_VERSION)
AC_SUBST(ANDROID_API_LEVEL)
AC_SUBST(ANDROID_APP_ABI)
-AC_SUBST(ANDROID_GCC_TOOLCHAIN_VERSION)
AC_SUBST(ANDROID_SYSROOT_PLATFORM)
AC_SUBST(ANDROID_TOOLCHAIN)
diff --git a/external/nss/ExternalProject_nss.mk
b/external/nss/ExternalProject_nss.mk
index bf16d7d97e5e..9b44bd2948e1 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -80,7 +80,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): \
$(if $(filter ANDROID,$(OS)),
-DSQLITE_DISABLE_LFS=1)" \
CCC="$(CXX) $(gb_DEBUGINFO_FLAGS)" \
$(if $(CROSS_COMPILING),NSINSTALL="$(if $(filter
MACOSX,$(OS_FOR_BUILD)),xcrun python3,$(call
gb_ExternalExecutable_get_command,python))
$(SRCDIR)/external/nss/nsinstall.py") \
- $(if $(filter ANDROID,$(OS)),OS_TARGET=Android
OS_TARGET_RELEASE=$(ANDROID_API_LEVEL) ARCHFLAG="" DEFAULT_COMPILER=clang
ANDROID_NDK=$(ANDROID_NDK_DIR)
ANDROID_TOOLCHAIN_VERSION=$(ANDROID_GCC_TOOLCHAIN_VERSION)
ANDROID_PREFIX=$(HOST_PLATFORM) ANDROID_SYSROOT=$(ANDROID_NDK_DIR)/sysroot) \
+ $(if $(filter ANDROID,$(OS)),OS_TARGET=Android
OS_TARGET_RELEASE=$(ANDROID_API_LEVEL) ARCHFLAG="" DEFAULT_COMPILER=clang
ANDROID_NDK=$(ANDROID_NDK_DIR) ANDROID_TOOLCHAIN_VERSION=obsolete
ANDROID_PREFIX=$(HOST_PLATFORM) ANDROID_SYSROOT=$(ANDROID_NDK_DIR)/sysroot) \
NSS_DISABLE_GTESTS=1 \
nss_build_all \
&& rm -f $(gb_UnpackedTarball_workdir)/nss/dist/out/lib/*.a \
