Fix build android with axmol cmdline arch not working

Author: halx99

1k/build.ps1

@@ -240,8 +240,8 @@ foreach ($arg in $args) {
     if (!$optName) {
         if ($arg.StartsWith('-')) {
             $optName = $arg.SubString(1)
-            if($optName.EndsWith(':')) { 
-                $optName = $optName.TrimEnd(':') 
+            if($optName.EndsWith(':')) {
+                $optName = $optName.TrimEnd(':')
             }
             if ($optName.startsWith('j')) {
                 $job_count = $null
@@ -687,7 +687,7 @@ function setup_nuget() {
 }
 
 # setup python3, not install automatically
-# ensure python3.exe is python.exe to solve unexpected error, i.e. 
+# ensure python3.exe is python.exe to solve unexpected error, i.e.
 # google gclient require python3.exe, on windows 10/11 will locate to
 # a dummy C:\Users\halx99\AppData\Local\Microsoft\WindowsApps\python3.exe cause
 # shit strange error
@@ -718,7 +718,7 @@ function setup_glslcc() {
     $b1k.rmdirs($glslcc_bin)
     $glslcc_pkg = Join-Path $external_prefix "glslcc-$suffix"
     $b1k.del($glslcc_pkg)
-    
+
     $glscc_url = devtool_url glslcc-$glslcc_ver-$suffix
 
     download_and_expand $glscc_url "$glslcc_pkg" $glslcc_bin
@@ -854,7 +854,7 @@ function setup_nsis() {
     $nsis_prog, $nsis_ver = find_prog -name 'nsis' -cmd 'makensis' -params '/VERSION' -path $nsis_bin -silent $true
     if (!$nsis_prog) {
         $b1k.rmdirs($nsis_bin)
-        
+
         download_and_expand "https://nchc.dl.sourceforge.net/project/nsis/NSIS%203/$nsis_ver/nsis-$nsis_ver.zip" "$external_prefix/nsis-$nsis_ver.zip" "$external_prefix"
         $nsis_dir = "$nsis_bin-$nsis_ver"
         if ($b1k.isdir($nsis_dir)) {
@@ -1196,7 +1196,7 @@ function setup_msvc() {
 # google gn build system, current windows only for build angleproject/dawn on windows
 function setup_gclient() {
     $OutputEncoding = [console]::InputEncoding = [console]::OutputEncoding = New-Object System.Text.UTF8Encoding
-    
+
     if (!$ninja_prog) {
         $ninja_prog = setup_ninja
     }
@@ -1575,7 +1575,7 @@ if (!$setupOnly) {
             }
         }
     }
-    
+
     if ($options.xt -ne 'gn') {
         $BUILD_ALL_OPTIONS = @()
         $BUILD_ALL_OPTIONS += $buildOptions
@@ -1654,7 +1654,7 @@ if (!$setupOnly) {
                     break
                 }
             }
-            
+
             if (!$BUILD_DIR) {
                 $BUILD_DIR = resolve_out_dir $cmake_build_prefix 'build_'
             }
@@ -1703,7 +1703,11 @@ if (!$setupOnly) {
                 }
             }
             else {
-                & $build_tool tasks
+                if ($optimize_flag -eq 'Debug') {
+                    & $build_tool configureCMakeDebug prepareKotlinBuildScriptModel $CONFIG_ALL_OPTIONS | Out-Host
+                } else {
+                    & $build_tool configureCMakeRelWithDebInfo prepareKotlinBuildScriptModel $CONFIG_ALL_OPTIONS | Out-Host
+                }
             }
             Pop-Location
         }
@@ -1748,7 +1752,7 @@ if (!$setupOnly) {
                     # apply additional build options
                     $BUILD_ALL_OPTIONS += "--parallel"
                     $BUILD_ALL_OPTIONS += "$($options.j)"
-                    
+
                     if (($cmake_generator -eq 'Xcode') -and !$BUILD_ALL_OPTIONS.Contains('--verbose')) {
                         $BUILD_ALL_OPTIONS += '--', '-quiet'
                     }
@@ -1767,10 +1771,10 @@ if (!$setupOnly) {
     else {
         # google gclient/gn build system
         # refer: https://chromium.googlesource.com/chromium/src/+/eca97f87e275a7c9c5b7f13a65ff8635f0821d46/tools/gn/docs/reference.md#args_specifies-build-arguments-overrides-examples
-        
+
         $stored_env_path = $null
         $gn_buildargs_overrides = @()
-        
+
         if ($Global:is_winrt) {
             $gn_buildargs_overrides += 'target_os=\"winuwp\"'
         }
@@ -1808,7 +1812,7 @@ if (!$setupOnly) {
         }
 
         Write-Output ("gn_buildargs_overrides=$gn_buildargs_overrides, Count={0}" -f $gn_buildargs_overrides.Count)
-        
+
         $BUILD_DIR = resolve_out_dir $null 'out/'
 
         if ($rebuild) {

core/platform/android/libaxmol/axutils.gradle

@@ -102,9 +102,6 @@ class axutils {
         if (project.properties.__1K_CMAKE_VERSION != null)
             cmakeVer = project.properties.__1K_CMAKE_VERSION
 
-        if (project.properties.__ARCHS != null)
-            project.properties.PROP_APP_ABI = project.properties.__ARCHS
-
         // Detecting sdkRoot
         def sdkRoot = null
         Properties localProps = new Properties()

docs/DevSetup.md

@@ -150,7 +150,7 @@ Note: if you use non-SDK provided CMake, you will need to download `ninja` from
   set ANDROID_HOME=D:\dev\adt\sdk
   
   # Goto xxx\proj.android
-  .\gradlew.bat assembleRelease -PPROP_BUILD_TYPE=cmake -PPROP_APP_ABI=arm64-v8a --parallel --info
+  .\gradlew.bat assembleRelease -P__1K_ARCHS=arm64-v8a --parallel --info
   ```
 
 ### iOS, tvOS and macOS

setup.ps1

@@ -342,4 +342,19 @@ if ($updateGradleVersion) {
     update_gradle_for_test 'lua-tests'
 }
 
+if ($IsLinux -and (Test-Path '/etc/wsl.conf' -PathType Leaf)) {
+    Write-Host "Are want remove host windows path from wsl? (y/n) " -NoNewline
+    $answer = Read-Host
+    if ($answer -like 'y*') {
+        $wsl_conf = [System.IO.File]::ReadAllText('/etc/wsl.conf')
+        if (!$wsl_conf.Contains('appendWindowsPath')) {
+            $wsl_conf += "`n[interop]`nappendWindowsPath = false"
+            $wsl_conf_tmp_file = (Join-Path $AX_ROOT 'wsl.conf')
+            [System.IO.File]::WriteAllText($wsl_conf_tmp_file, $wsl_conf)
+            sudo mv -f $wsl_conf_tmp_file /etc/wsl.conf
+            println "Update /etc/wsl.conf success, please run 'wsl --shutdown' on your host windows, then re-enter wsl"
+        }
+    }
+}
+
 $b1k.pause("setup successfully, please restart the terminal to make added system variables take effect")

templates/common/proj.android/app/build.gradle

@@ -30,8 +30,7 @@ android {
         }
 
         ndk {
-            abiFilters = []
-            abiFilters.addAll(PROP_APP_ABI.split(':').collect{it as String})
+            abiFilters = __1K_ARCHS.split(':').collect{it as String}
         }
     }
 

templates/common/proj.android/gradle.properties

@@ -28,8 +28,8 @@ PROP_TARGET_SDK_VERSION=34
 # List of CPU Archtexture to build that application with
 # Available architextures (armeabi-v7a | arm64-v8a | x86)
 # To build for multiple architexture, use the `:` between them
-# Example - PROP_APP_ABI=armeabi-v7a:arm64-v8a:x86
-PROP_APP_ABI=arm64-v8a
+# Example - __1K_ARCHS=armeabi-v7a:arm64-v8a:x86
+__1K_ARCHS=arm64-v8a
 
 # uncomment it and fill in sign information for generate signed apk
 #KEY_STORE_FILE=file path of keystore

tests/cpp-tests/proj.android/app/build.gradle

@@ -31,8 +31,7 @@ android {
         }
 
         ndk {
-            abiFilters = []
-            abiFilters.addAll(PROP_APP_ABI.split(':').collect{it as String})
+            abiFilters = __1K_ARCHS.split(':').collect{it as String}
         }
     }
 

tests/cpp-tests/proj.android/gradle.properties

@@ -28,8 +28,8 @@ PROP_TARGET_SDK_VERSION=34
 # List of CPU Archtexture to build that application with
 # Available architextures (armeabi-v7a | arm64-v8a | x86)
 # To build for multiple architexture, use the `:` between them
-# Example - PROP_APP_ABI=armeabi-v7a:arm64-v8a:x86
-PROP_APP_ABI=arm64-v8a
+# Example - __1K_ARCHS=armeabi-v7a:arm64-v8a:x86
+__1K_ARCHS=arm64-v8a
 
 # uncomment it and fill in sign information for generate signed apk
 #KEY_STORE_FILE=file path of keystore

tests/fairygui-tests/proj.android/app/build.gradle

@@ -31,8 +31,7 @@ android {
         }
 
         ndk {
-            abiFilters = []
-            abiFilters.addAll(PROP_APP_ABI.split(':').collect{it as String})
+            abiFilters = __1K_ARCHS.split(':').collect{it as String}
         }
     }
 

tests/fairygui-tests/proj.android/gradle.properties

@@ -28,8 +28,8 @@ PROP_TARGET_SDK_VERSION=34
 # List of CPU Archtexture to build that application with
 # Available architextures (armeabi-v7a | arm64-v8a | x86)
 # To build for multiple architexture, use the `:` between them
-# Example - PROP_APP_ABI=armeabi-v7a:arm64-v8a:x86
-PROP_APP_ABI=arm64-v8a
+# Example - __1K_ARCHS=armeabi-v7a:arm64-v8a:x86
+__1K_ARCHS=arm64-v8a
 
 # uncomment it and fill in sign information for generate signed apk
 # KEY_STORE_FILE=path/to/keystore.jks