Skip to content

Commit b5c181a

Browse files
committed
Update android min sdk to 23
Ensure cmdline & android studio cmake generate parameters consistency
1 parent 66f4060 commit b5c181a

2 files changed

Lines changed: 1 addition & 4 deletions

File tree

1k/build.profiles

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ target_sdk=37
5454

5555
# The android min sdk version, @gradle
5656
# as min as possible, min_sdk<23 supported, but deprecated
57-
min_sdk=21
57+
min_sdk=23
5858

5959
# The gradle version, @setup.ps1
6060
# as latest as possible

axmol/platform/android/dsl/axmol.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -536,9 +536,6 @@ class AxmolUtils {
536536
def androidProjDir = project.projectDir.toString().replaceAll("\\\\", "/")
537537
def ninjaPath = buildProfiles['ninjaPath'].replaceAll("\\\\", "/")
538538
options.add('"-DCMAKE_FIND_ROOT_PATH="')
539-
if (!isInsideAndroidStudio()) {
540-
options.add("\"-DCMAKE_MAKE_PROGRAM=${ninjaPath}\"")
541-
}
542539
options.add('"-DANDROID_STL=c++_shared"')
543540
options.add('"-DANDROID_TOOLCHAIN=clang"')
544541
options.add('"-DANDROID_ARM_NEON=TRUE"')

0 commit comments

Comments
 (0)