Improve android sdk setup (#2588)

load sdk.dir from 'proj.android/local.properties' if it's present

Author: halx99

1k/1kiss.ps1

@@ -481,12 +481,25 @@ if ($1k.isfile($manifest_file)) {
 
 if($1k.isfile($Global:__1k_user_profile)) {
     $1k.println("Loading user build profile: $__1k_user_profile")
-    $user_profile = ConvertFrom-Props (Get-Content $__1k_user_profile)
-    foreach($entry in $user_profile.GetEnumerator()) {
+    $profile_entries = ConvertFrom-Props (Get-Content $__1k_user_profile)
+    foreach($entry in $profile_entries.GetEnumerator()) {
         $manifest[$entry.Key] = $entry.Value
     }
 }
 
+function unescape_path([string]$Path) {
+    return ($Path -replace '\\:', ':') -replace '\\\\', '\'
+}
+
+$Script:preferred_sdk_dir = $null
+if($1k.isfile($Global:__1k_android_local_profile)) {
+    $1k.println("Loading android local profile: $__1k_android_local_profile")
+    $profile_entries = ConvertFrom-Props (Get-Content $__1k_android_local_profile)
+    if ($profile_entries.Contains('sdk.dir')) {
+        $Script:preferred_sdk_dir = unescape_path $profile_entries['sdk.dir']
+    }
+}
+
 $install_prefix = if ($options.prefix) { $options.prefix } else { Join-Path $HOME '.1kiss' }
 if (!$1k.isdir($install_prefix)) {
     $1k.mkdirs($install_prefix)
@@ -1278,12 +1291,16 @@ function setup_android_sdk() {
         $ndk_ver = $ndk_ver.Substring(0, $ndk_ver.Length - 1)
     }
 
-    $__1k_sdk_root = Join-Path $install_prefix 'adt/sdk'
-
     $sdk_dirs = @()
-    $1k.insert([ref]$sdk_dirs, $env:ANDROID_HOME)
-    $1k.insert([ref]$sdk_dirs, $env:ANDROID_SDK_ROOT)
-    $1k.insert([ref]$sdk_dirs, $__1k_sdk_root)
+    if ($Script:preferred_sdk_dir) {
+        $1k.println("Add preferred android sdk dir: $Script:preferred_sdk_dir")
+        $sdk_dirs += $Script:preferred_sdk_dir
+    } else {
+        $__1k_sdk_root = Join-Path $install_prefix 'adt/sdk'
+        $1k.insert([ref]$sdk_dirs, $env:ANDROID_HOME)
+        $1k.insert([ref]$sdk_dirs, $env:ANDROID_SDK_ROOT)
+        $1k.insert([ref]$sdk_dirs, $__1k_sdk_root)
+    }
 
     $ndk_minor_base = [int][char]'a'
 
@@ -1337,8 +1354,9 @@ function setup_android_sdk() {
         }
     }
 
-    if(!$sdk_root) {
-        $sdk_root = Join-Path $install_prefix 'adt/sdk'
+    if (!$sdk_root) {
+        $sdk_root = $Script:preferred_sdk_dir
+        if (!$sdk_root) { Join-Path $install_prefix 'adt/sdk' }
         $1k.mkdirs($sdk_root)
     }
 

tools/cmdline/build.ps1

@@ -103,6 +103,12 @@ if($Global:is_axmol_app) {
     $Global:__1k_user_profile = Join-Path $source_proj_dir '.axproj'
 }
 
+# the android local.properties generated by android studio
+$ax_app_android_profile = Join-Path $source_proj_dir 'proj.android/local.properties'
+if (Test-Path $ax_app_android_profile -PathType Leaf) {
+    $Global:__1k_android_local_profile = $ax_app_android_profile
+}
+
 # start construct full cmd line
 $1k_args = @()