Upgrade Android NDK to r29

IvanSavenko · IvanSavenko · commit 2161efeef956 · 2025-11-04T12:38:19.000+02:00
diff --git a/conan_patches/qt/conandata.yml b/conan_patches/qt/conandata.yml
@@ -1,9 +1,5 @@
 patches:
   "5.15.16":
-    - "base_path": "qt5/qtbase"
-      "patch_file": "patches/android-19-jar.diff"
-    - "base_path": "qt5/qtbase"
-      "patch_file": "patches/android-19-java.diff"
     - "base_path": "qt5/qtbase"
       "patch_file": "patches/android-21-22.diff"
     - "base_path": "qt5/qtbase"
diff --git a/conan_patches/qt/patches/android-19-jar.diff b/conan_patches/qt/patches/android-19-jar.diff
diff --git a/conan_patches/qt/patches/android-19-java.diff b/conan_patches/qt/patches/android-19-java.diff
diff --git a/conan_profiles/android-32 b/conan_profiles/android-32
@@ -2,7 +2,7 @@ include(base/android)
 
 [settings]
 arch=armv7
-os.api_level=19
+os.api_level=21
 
 [conf]
 # remove after switching to API level >= 24
diff --git a/conan_profiles/base/android b/conan_profiles/base/android
@@ -6,7 +6,7 @@ include(common)
 compiler=clang
 compiler.cppstd={{ vars.cppstd }}
 compiler.libcxx=c++_shared
-compiler.version=14
+compiler.version=21
 os=Android
 
 [conf]
diff --git a/conan_profiles/base/android-ndk b/conan_profiles/base/android-ndk
@@ -1,2 +1,2 @@
 [tool_requires]
-android-ndk/r25c
+android-ndk/r29
diff --git a/conanfile.py b/conanfile.py
@@ -53,7 +53,7 @@ def config_options(self):
     def requirements(self):
         # lib
         # boost::filesystem removed support for Windows < 10 in v1.87
-        boostMinVersion = "1.69"
+        boostMinVersion = "1.74"
         if self.options.get_safe("target_pre_windows10", False):
             self.requires(f"boost/[>={boostMinVersion} <1.87]")
         else:

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`[tool_requires]`
`2`		`-android-ndk/r25c`
	`2`	`+android-ndk/r29`