Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve android gradle utils

This commit is contained in:
halx99 2022-08-07 09:26:56 +08:00
parent f03bce1380
commit 9b7910daea
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
core/platform/android/libcocos2dx/axistools.gradle
View File

@ -91,7 +91,7 @@ class VersionComparator implements Comparator<String> {
class axistools { class axistools {
static String[] findNativeBuildTools(project, ndkVer = "23.2.8568313", cmakeVer = "3.22.1+") { static String[] findNativeBuildTools(project, ndkVer = "23.2.8568313+", cmakeVer = "3.22.1+") {
// Detecting sdkRoot // Detecting sdkRoot
def sdkRoot = null def sdkRoot = null
@ -131,14 +131,25 @@ class axistools {
ndkVer = ndkVer.substring(0, ndkVer.length() - 1) ndkVer = ndkVer.substring(0, ndkVer.length() - 1)
} }
def ndkDirs = [] def verList = []
File dir = new File("${sdkRoot}/ndk") File dir = new File("${sdkRoot}${File.separator}ndk")
if (dir.isDirectory()) { if (dir.isDirectory()) {
for (ndkDir in dir.listFiles()) { for (ndkDir in dir.listFiles()) {
ndkDirs.add(ndkDir.toString()) verList.add(ndkDir.getName())
} }
} }
verList.sort {a,b ->
return axistools.compareVersion(b, a)
}
def ndkDirs = []
// Collect ndkDirs for search
for(ver in verList){
ndkDirs.add("${sdkRoot}${File.separator}ndk${File.separator}${ver}")
}
/* Find suitable ndk in dirs */ /* Find suitable ndk in dirs */
rets[0] = ndkVer rets[0] = ndkVer
@ -173,7 +184,7 @@ class axistools {
def verList = [] def verList = []
// Scan installed cmake in $sdk_root/cmake // Scan installed cmake in $sdk_root/cmake
File sdkCMakeDir = new File(sdkRoot + '/cmake') File sdkCMakeDir = new File("${sdkRoot}${File.separator}cmake")
if (sdkCMakeDir.isDirectory()) { if (sdkCMakeDir.isDirectory()) {
for (cmakeDir in sdkCMakeDir.listFiles()) { for (cmakeDir in sdkCMakeDir.listFiles()) {
verList.add(cmakeDir.getName()) verList.add(cmakeDir.getName())
@ -186,8 +197,8 @@ class axistools {
} }
// Collect cmakeBinDirs for search // Collect cmakeBinDirs for search
for(foundVer in verList){ for(ver in verList){
cmakeBinDir = sdkRoot + File.separator + "cmake" + File.separator + foundVer + File.separator + "bin" cmakeBinDir = sdkRoot + File.separator + "cmake" + File.separator + ver + File.separator + "bin"
if(new File(cmakeBinDir).isDirectory()) { if(new File(cmakeBinDir).isDirectory()) {
cmakeBinDirs.add(cmakeBinDir) cmakeBinDirs.add(cmakeBinDir)
} }
@ -222,7 +233,7 @@ class axistools {
private static String findNDKInDir(ndkVer, allowNewerNdk, ndkDir, rets) { private static String findNDKInDir(ndkVer, allowNewerNdk, ndkDir, rets) {
def found = null def found = null
def properties = new Properties() def properties = new Properties()
File propertiesFile = new File("$ndkDir/source.properties") File propertiesFile = new File("$ndkDir${File.separator}source.properties")
propertiesFile.withInputStream { propertiesFile.withInputStream {
properties.load(it) properties.load(it)
def foundNdkVer = properties['Pkg.Revision'] def foundNdkVer = properties['Pkg.Revision']