Skip to content

Commit 73624bf

Browse files
committed
Upgrade Android NDK to r29
1 parent 1bfe97e commit 73624bf

File tree

5 files changed

+6
-4
lines changed

5 files changed

+6
-4
lines changed

conan_profiles/android-32

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include(base/android)
22

33
[settings]
44
arch=armv7
5-
os.api_level=19
5+
os.api_level=21
66

77
[conf]
88
# remove after switching to API level >= 24

conan_profiles/base/android

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ include(common)
66
compiler=clang
77
compiler.cppstd={{ vars.cppstd }}
88
compiler.libcxx=c++_shared
9-
compiler.version=14
9+
compiler.version=21
1010
os=Android
1111

1212
[conf]

conan_profiles/base/android-ndk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[tool_requires]
2-
android-ndk/r25c
2+
android-ndk/r29

conan_profiles/base/common

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ ninja/1.12.1
99
# TODO: remove after https://github.com/conan-io/conan-center-index/pull/27125 is merged
1010
# Qt 5 depends on 0.4.8, but it doesn't build for iOS
1111
md4c/0.4.8: md4c/0.5.2
12+
# Fix for Version conflict: Conflict between opus/1.4 and opus/1.5.2 in the graph. Conflict originates from ffmpeg/7.1.1
13+
opus/*: opus/1.5.2
1214

1315
[conf]
1416
tools.cmake.cmaketoolchain:generator=Ninja

conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def config_options(self):
5353
def requirements(self):
5454
# lib
5555
# boost::filesystem removed support for Windows < 10 in v1.87
56-
boostMinVersion = "1.69"
56+
boostMinVersion = "1.74"
5757
if self.options.get_safe("target_pre_windows10", False):
5858
self.requires(f"boost/[>={boostMinVersion} <1.87]")
5959
else:

0 commit comments

Comments
 (0)