Skip to content

Commit 2004cb5

Browse files
committed
Don't use android legacy cmake toolchain file
1 parent 1f46900 commit 2004cb5

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

1k/1kiss.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1660,6 +1660,7 @@ function preprocess_andorid() {
16601660
$cmake_toolchain_file = Join-Path $ndk_root 'build/cmake/android.toolchain.cmake'
16611661
$arch = $t_archs[$options.a]
16621662
$outputOptions += "-DCMAKE_TOOLCHAIN_FILE=$cmake_toolchain_file", "-DANDROID_ABI=$arch"
1663+
$outputOptions += "-DANDROID_USE_LEGACY_TOOLCHAIN_FILE=false"
16631664
# If set to ONLY, then only the roots in CMAKE_FIND_ROOT_PATH will be searched
16641665
# If set to BOTH, then the host system paths and the paths in CMAKE_FIND_ROOT_PATH will be searched
16651666
# If set to NEVER, then the roots in CMAKE_FIND_ROOT_PATH will be ignored and only the host system root will be used

core/platform/android/dsl/axmol.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,7 @@ class AxmolUtils {
370370
options.add('"-DANDROID_TOOLCHAIN=clang"')
371371
options.add('"-DANDROID_ARM_NEON=TRUE"')
372372
options.add('"-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"')
373+
options.add('"-DANDROID_USE_LEGACY_TOOLCHAIN_FILE=false"')
373374
options.add("\"-D_AX_ANDROID_PROJECT_DIR=${androidProjDir}\"")
374375
buildProfiles['cmakeOptions'] = options.toString()
375376
}

0 commit comments

Comments
 (0)