configure.ac |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 2ce02e409207e681992b39ed03544e643d6abbb6
Author:     Michael Weghorn <[email protected]>
AuthorDate: Wed Jul 9 15:03:26 2025 +0200
Commit:     Skyler Grey <[email protected]>
CommitDate: Thu Oct 9 15:48:22 2025 +0200

    android: Declare support for NDK 29
    
    A build using NDK 29.0.13599879 works fine for me
    and Android Viewer works fine in a quick test (with an additional
    local revert of commit 9d1e76f7da12353afc3d9479d3b2ecddbb2a71e6
    to prevent a deadlock when opening documents that is unrelated
    to this change here).
    
    Change-Id: Ia82d3daa00c299cb3d244e973b9da3ceb840f4b2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187577
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <[email protected]>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192038
    Reviewed-by: Skyler Grey <[email protected]>
    Tested-by: Jenkins CollaboraOffice <[email protected]>

diff --git a/configure.ac b/configure.ac
index 740eaf6bb1f2..25cfa8c7b51e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -777,11 +777,11 @@ if test -n "$with_android_ndk"; then
     
11.1.*|12.1.*|13.1.*|14.1.*|16.*|17.*|18.*|19.*|20.*|21.*|22.*|23.*|24.*|25.*|26.*)
         AC_MSG_ERROR([Building for Android requires NDK version >= 27.*])
         ;;
-    27.*|28.*)
+    27.*|28.*|29.*)
         ;;
     *)
-        AC_MSG_WARN([Untested Android NDK version $ANDROID_NDK_VERSION, only 
versions 27.* to 28.* have been used successfully. Proceed at your own risk.])
-        add_warning "Untested Android NDK version $ANDROID_NDK_VERSION, only 
versions 27.* to 28.* have been used successfully. Proceed at your own risk."
+        AC_MSG_WARN([Untested Android NDK version $ANDROID_NDK_VERSION, only 
versions 27.* to 29.* have been used successfully. Proceed at your own risk.])
+        add_warning "Untested Android NDK version $ANDROID_NDK_VERSION, only 
versions 27.* to 29.* have been used successfully. Proceed at your own risk."
         ;;
     esac
 

Reply via email to