Skip to content

Commit c7b0de1

Browse files
committed
CI: set_matrix: add more android toolchain parameter
Try to fix the Android toolchain for more projects by setting more variables. Fixes: #825
1 parent ca2643f commit c7b0de1

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

.github/workflows/set_matrix.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,9 @@ def create_toolchain(
7575
out += f"""\
7676
set(CMAKE_SYSTEM_NAME "Android")
7777
set(CMAKE_SYSTEM_VERSION "{android_api}") # API level
78+
set(ANDROID_PLATFORM "android-{android_api}") # API level
7879
set(CMAKE_ANDROID_ARCH_ABI "{android_arch_abi}")
80+
set(ANDROID_ABI "{android_arch_abi}")
7981
set(CMAKE_ANDROID_NDK "$ENV{{ANDROID_NDK}}") # provided by GitHub
8082
8183
string(COMPARE EQUAL "${{CMAKE_ANDROID_NDK}}" "" _is_empty)
@@ -95,6 +97,7 @@ def create_toolchain(
9597
# for android if we have libcxx in toolchain assume static runtime
9698
out += f"""\
9799
set(CMAKE_ANDROID_STL_TYPE "c++_static") # LLVM libc++ static
100+
set(ANDROID_STL "c++_static")
98101
"""
99102

100103
m = re.match(r"^osx-(\d+)-(\d+)", parsed_toolchain)

0 commit comments

Comments
 (0)