android/Bootstrap/Makefile.shared | 1 +
config_host.mk.in | 1 +
configure.ac | 1 +
3 files changed, 3 insertions(+)
New commits:
commit f895ee6de44cddfb86cdb0912693f7aa56cb3340
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu May 16 04:51:47 2024 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu May 16 12:13:02 2024 +0200
android: Set android.ndkVersion for Gradle
Set the `android.ndkVersion` property [1] for
the Android Gradle Plugin, in addition to `android.ndkPath`
that is set there already.
This addresses the warning
> Task :stripStrippedUIEditingDebugDebugSymbols
[CXX1100] android.ndkVersion is [26.1.10909125] but android.ndkPath
/home/michi/Android/Sdk/ndk/25.1.8937393 refers to a different version
[25.1.8937393].
[CXX1100] android.ndkVersion is [26.1.10909125] but android.ndkPath
/home/michi/Android/Sdk/ndk/25.1.8937393 refers to a different version
[25.1.8937393].
[CXX1100] android.ndkVersion is [26.1.10909125] but android.ndkPath
/home/michi/Android/Sdk/ndk/25.1.8937393 refers to a different version
[25.1.8937393].
[CXX1100] android.ndkVersion is [26.1.10909125] but android.ndkPath
/home/michi/Android/Sdk/ndk/25.1.8937393 refers to a different version
[25.1.8937393].
[CXX1100] android.ndkVersion is [26.1.10909125] but android.ndkPath
/home/michi/Android/Sdk/ndk/25.1.8937393 refers to a different version
[25.1.8937393].
[CXX1100] android.ndkVersion is [26.1.10909125] but android.ndkPath
/home/michi/Android/Sdk/ndk/25.1.8937393 refers to a different version
[25.1.8937393].
[CXX1100] android.ndkVersion is [26.1.10909125] but android.ndkPath
/home/michi/Android/Sdk/ndk/25.1.8937393 refers to a different version
[25.1.8937393].
[CXX1100] android.ndkVersion is [26.1.10909125] but android.ndkPath
/home/michi/Android/Sdk/ndk/25.1.8937393 refers to a different version
[25.1.8937393].
[CXX1100] android.ndkVersion is [26.1.10909125] but android.ndkPath
/home/michi/Android/Sdk/ndk/25.1.8937393 refers to a different version
[25.1.8937393].
[CXX1100] android.ndkVersion is [26.1.10909125] but android.ndkPath
/home/michi/Android/Sdk/ndk/25.1.8937393 refers to a different version
[25.1.8937393].
[CXX1100] android.ndkVersion is [26.1.10909125] but android.ndkPath
/home/michi/Android/Sdk/ndk/25.1.8937393 refers to a different version
[25.1.8937393].
[CXX1100] android.ndkVersion is [26.1.10909125] but android.ndkPath
/home/michi/Android/Sdk/ndk/25.1.8937393 refers to a different version
[25.1.8937393].
[CXX1100] android.ndkVersion is [26.1.10909125] but android.ndkPath
/home/michi/Android/Sdk/ndk/25.1.8937393 refers to a different version
[25.1.8937393].
[CXX1100] android.ndkVersion is [26.1.10909125] but android.ndkPath
/home/michi/Android/Sdk/ndk/25.1.8937393 refers to a different version
[25.1.8937393].
Unable to strip the following libraries, packaging them as they are:
libc++_shared.so, libfreebl3.so, liblo-native-code.so, libnspr4.so, libnss3.so,
libnssckbi.so, libnssdbm3.so, libnssutil3.so, libplc4.so, libplds4.so,
libsmime3.so, libsoftokn3.so, libsqlite3.so, libssl3.so.
that started to show up in a local
`--with-android-ndk=$HOME/Android/Sdk/ndk/25.1.8937393`
Android build after
commit 1610ebc06b34263bf3e525babe1e583b932f6242
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Mon May 13 10:47:49 2024 +0200
android: Update Android Gradle Plugin to 8.4.0
... and gradle to 8.6, as suggested by Android Studio.
As described at [2], that Android Gradle Plugin defaults to
NDK 26.1.10909125.
[1]
https://developer.android.com/studio/projects/install-ndk#apply-specific-version
[2] https://developer.android.com/build/releases/gradle-plugin
Change-Id: Ied81f13f535303f9578177646f177b4ef791eefa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167715
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/android/Bootstrap/Makefile.shared
b/android/Bootstrap/Makefile.shared
index 0cd5ec6fcbda..b93735234b3d 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -108,6 +108,7 @@ liboSettings.gradle: $(BUILDDIR)/config_build.mk
$(BUILDDIR)/config_host.mk \
&& echo "}" \
&& echo "android {" \
&& echo " ndkPath '$(ANDROID_NDK_DIR)'" \
+ && echo " ndkVersion '$(ANDROID_NDK_VERSION)'" \
&& echo "}" \
&& echo "android.defaultConfig {" \
&& echo " applicationId '$(ANDROID_PACKAGE_NAME)'" \
diff --git a/config_host.mk.in b/config_host.mk.in
index fe1fb546a6d1..e303f5945d99 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -16,6 +16,7 @@ export BUILDDIR=@BUILDDIR@
export ABW_CFLAGS=$(gb_SPACE)@ABW_CFLAGS@
export ABW_LIBS=$(gb_SPACE)@ABW_LIBS@
export ANDROID_NDK_DIR=@ANDROID_NDK_DIR@
+export ANDROID_NDK_VERSION=@ANDROID_NDK_VERSION@
export ANDROID_API_LEVEL=@ANDROID_API_LEVEL@
export ANDROID_APP_ABI=@ANDROID_APP_ABI@
export ANDROID_SDK_DIR=@ANDROID_SDK_DIR@
diff --git a/configure.ac b/configure.ac
index 815900fc21ea..fbd6196921a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -847,6 +847,7 @@ if test -n "$with_android_ndk"; then
fi
fi
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)
