github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-07 23:03:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-7512: Fix logic for detecting SDK directory

Browse Source
This commit is contained in:
Ian Clelland 2014-09-15 12:15:32 -04:00
parent f9b89e98c2
commit 4be92f285a
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
bin/templates/project/cordova.gradle
View File

@ -84,9 +84,13 @@ int compareVersions(String a, String b) {
String getAndroidSdkDir() { String getAndroidSdkDir() {
def rootDir = project.rootDir def rootDir = project.rootDir
def androidSdkDir = null
String envVar = System.getenv("ANDROID_HOME")
def localProperties = new File(rootDir, 'local.properties') def localProperties = new File(rootDir, 'local.properties')
def androidSdkDir = "" String systemProperty = System.getProperty("android.home")
if (localProperties.exists()) { if (envVar != null) {
androidSdkDir = envVar
} else if (localProperties.exists()) {
Properties properties = new Properties() Properties properties = new Properties()
localProperties.withInputStream { instr -> localProperties.withInputStream { instr ->
properties.load(instr) properties.load(instr)
@ -98,23 +102,16 @@ String getAndroidSdkDir() {
sdkDirProp = properties.getProperty('android.dir') sdkDirProp = properties.getProperty('android.dir')
if (sdkDirProp != null) { if (sdkDirProp != null) {
androidSdkDir = (new File(rootDir, sdkDirProp)).getAbsolutePath() androidSdkDir = (new File(rootDir, sdkDirProp)).getAbsolutePath()
} else {
throw new RuntimeException(
"No sdk.dir property defined in local.properties file.")
}
}
} else {
String envVar = System.getenv("ANDROID_HOME")
if (envVar != null) {
androidSdkDir = envVar
} else {
String property = System.getProperty("android.home")
if (property != null) {
androidSdkDir = property
} }
} }
} }
println androidSdkDir if (androidSdkDir == null && systemProperty != null) {
androidSdkDir = systemProperty
}
if (androidSdkDir == null) {
throw new RuntimeException(
"Unable to determine Android SDK directory.")
}
androidSdkDir androidSdkDir
} }