cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i..@apache.org
Subject android commit: CB-7512: Fix logic for detecting SDK directory
Date Mon, 15 Sep 2014 16:15:47 GMT
Repository: cordova-android
Updated Branches:
  refs/heads/master f9b89e98c -> 4be92f285


CB-7512: Fix logic for detecting SDK directory


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/4be92f28
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/4be92f28
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/4be92f28

Branch: refs/heads/master
Commit: 4be92f285a7c9a793815456860e33dad3eb76d03
Parents: f9b89e9
Author: Ian Clelland <iclelland@chromium.org>
Authored: Mon Sep 15 12:15:32 2014 -0400
Committer: Ian Clelland <iclelland@chromium.org>
Committed: Mon Sep 15 12:15:32 2014 -0400

----------------------------------------------------------------------
 bin/templates/project/cordova.gradle | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/4be92f28/bin/templates/project/cordova.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova.gradle b/bin/templates/project/cordova.gradle
index f552a47..6c7d0ab 100644
--- a/bin/templates/project/cordova.gradle
+++ b/bin/templates/project/cordova.gradle
@@ -84,9 +84,13 @@ int compareVersions(String a, String b) {
 
 String getAndroidSdkDir() {
     def rootDir = project.rootDir
+    def androidSdkDir = null
+    String envVar = System.getenv("ANDROID_HOME")
     def localProperties = new File(rootDir, 'local.properties')
-    def androidSdkDir = ""
-    if (localProperties.exists()) {
+    String systemProperty = System.getProperty("android.home")
+    if (envVar != null) {
+        androidSdkDir = envVar
+    } else if (localProperties.exists()) {
         Properties properties = new Properties()
         localProperties.withInputStream { instr ->
             properties.load(instr)
@@ -98,23 +102,16 @@ String getAndroidSdkDir() {
             sdkDirProp = properties.getProperty('android.dir')
             if (sdkDirProp != null) {
                 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
 }
 


Mime
View raw message