From c57d8d6184d464060b9dc43d199c9a7b8f082ee6 Mon Sep 17 00:00:00 2001
From: Antonis Geralis <b3lievem@yandex.com>
Date: Wed, 10 Jul 2024 19:10:29 +0300
Subject: [PATCH] make consistent

---
 .github/workflows/ci.yml | 42 +++++++++++++++++++++++-----------------
 build_android.nims       |  7 +------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 253d9f8..a3c6057 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-name: Nim CI
+name: Android CI
 
 on:
   push:
@@ -35,21 +35,23 @@ jobs:
         echo "${{ env.COMMANDLINETOOLS_SHA256 }}  ${{ env.COMMANDLINETOOLS_ZIP }}" | sha256sum -c -
         mkdir android-sdk
         unzip -q ${{ env.COMMANDLINETOOLS_ZIP }} -d android-sdk
+        # Set ANDROID_HOME environment variable
+        ANDROID_HOME="${GITHUB_WORKSPACE}/android-sdk"
+        echo "ANDROID_HOME=$ANDROID_HOME" >> $GITHUB_ENV
         cd android-sdk/cmdline-tools/bin
-        yes | ./sdkmanager --licenses --sdk_root=../..
-        ./sdkmanager --update --sdk_root=../..
-        ./sdkmanager --install "build-tools;34.0.0" --sdk_root=../..
-        ./sdkmanager --install "platform-tools" --sdk_root=../..
-        ./sdkmanager --install "platforms;android-${{ env.ANDROID_API_VERSION }}" --sdk_root=../..
+        yes | ./sdkmanager --licenses --sdk_root=$ANDROID_HOME
+        ./sdkmanager --update --sdk_root=$ANDROID_HOME
+        ./sdkmanager --install "build-tools;34.0.0" --sdk_root=$ANDROID_HOME
+        ./sdkmanager --install "platform-tools" --sdk_root=$ANDROID_HOME
+        ./sdkmanager --install "platforms;android-${{ env.ANDROID_API_VERSION }}" --sdk_root=$ANDROID_HOME
         cd ../../..
         # Set up Android NDK
         wget -nv https://dl.google.com/android/repository/${{ env.ANDROID_NDK_ZIP }}
         echo "${{ env.ANDROID_NDK_SHA1 }}  ${{ env.ANDROID_NDK_ZIP }}" | sha1sum -c -
         unzip -q ${{ env.ANDROID_NDK_ZIP }}
         mv android-ndk-r*/ android-ndk
-        # Set environment variables
-        echo "ANDROID_HOME=$GITHUB_WORKSPACE/android-sdk" >> $GITHUB_ENV
-        echo "ANDROID_NDK=$GITHUB_WORKSPACE/android-ndk" >> $GITHUB_ENV
+        # Set ANDROID_NDK environment variable
+        echo "ANDROID_NDK=${GITHUB_WORKSPACE}/android-ndk" >> $GITHUB_ENV
     - name: Run tests
       run: |
         sudo ln -sf ${{ env.JAVA_HOME }} /usr/lib/jvm/default-runtime
@@ -89,15 +91,20 @@ jobs:
         $hash = Get-FileHash "${{ env.COMMANDLINETOOLS_ZIP }}" -Algorithm SHA256
         if ($hash.Hash -ne "${{ env.COMMANDLINETOOLS_SHA256 }}") { throw "SHA256 mismatch for ${{ env.COMMANDLINETOOLS_ZIP }}" }
         Expand-Archive -Path "${{ env.COMMANDLINETOOLS_ZIP }}" -DestinationPath "android-sdk"
-        $env:PATH += ";${{ github.workspace }}\android-sdk\cmdline-tools\bin"
 
-        $licenses = @("y", "y", "y", "y", "y", "y", "y", "y")
-        $licenses | sdkmanager --licenses --sdk_root="${{ github.workspace }}\android-sdk"
+        # Set ANDROID_HOME environment variable
+        $ANDROID_HOME = "${{ github.workspace }}\android-sdk"
+        echo "ANDROID_HOME=$ANDROID_HOME" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
-        sdkmanager --update --sdk_root="${{ github.workspace }}\android-sdk"
-        sdkmanager --install "build-tools;34.0.0" --sdk_root="${{ github.workspace }}\android-sdk"
-        sdkmanager --install "platform-tools" --sdk_root="${{ github.workspace }}\android-sdk"
-        sdkmanager --install "platforms;android-${{ env.ANDROID_API_VERSION }}" --sdk_root="${{ github.workspace }}\android-sdk"
+        Set-Location $ANDROID_HOME\cmdline-tools\bin
+        $licenses = @("y", "y", "y", "y", "y", "y", "y", "y")
+        $licenses | sdkmanager --licenses --sdk_root=$ANDROID_HOME
+        .\sdkmanager --update --sdk_root=$ANDROID_HOME
+        .\sdkmanager --install "build-tools;34.0.0" --sdk_root=$ANDROID_HOME
+        .\sdkmanager --install "platform-tools" --sdk_root=$ANDROID_HOME
+        .\sdkmanager --install "platforms;android-${{ env.ANDROID_API_VERSION }}" --sdk_root=$ANDROID_HOME
+        # sdkmanager --install extras;google;usb_driver --sdk_root=$ANDROID_HOME
+        Set-Location ..\..\..
 
         # Set up Android NDK
         Invoke-WebRequest -Uri "https://dl.google.com/android/repository/${{ env.ANDROID_NDK_ZIP }}" -OutFile "${{ env.ANDROID_NDK_ZIP }}"
@@ -112,8 +119,7 @@ jobs:
           Write-Output "No directory found matching 'android-ndk-r*'."
         }
 
-        # Set environment variables
-        echo "ANDROID_HOME=${{ github.workspace }}\android-sdk" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        # Set ANDROID_NDK environment variable
         echo "ANDROID_NDK=${{ github.workspace }}\android-ndk" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
     - name: Run tests
       run: |
diff --git a/build_android.nims b/build_android.nims
index 222e2f4..e47fa28 100644
--- a/build_android.nims
+++ b/build_android.nims
@@ -64,7 +64,7 @@ const
   AppScreenOrientation = landscape
   AppKeystorePass = "raylib"
 
-mode = ScriptMode.Verbose
+# mode = ScriptMode.Verbose
 
 task setup, "Set up raylib project for Android":
   # Create required temp directories for APK building
@@ -137,11 +137,6 @@ task compile, "Compile raylib project for Android":
         " -d:AndroidNdk=" & AndroidNdk & " -d:" & $AndroidGlEsVersion &
         " -o:" & ProjectBuildPath / "lib" / cpu.toArchName / ("lib" & ProjectLibraryName & ".so") &
         " --nimcache:" & nimcacheDir().parentDir / (ProjectName & "_" & $cpu) & " " & ProjectSourceFile)
-  for f in listFiles(ProjectBuildPath):
-    echo f
-  echo "inside lib"
-  for f in listFiles(ProjectBuildPath / "lib" / AndroidCPUs[0].toArchName):
-    echo f
   # Compile project .java code into .class (Java bytecode)
   exec(JavaHome / "bin/javac" & " -verbose --source 11 --target 11 -d " & ProjectBuildPath / "obj" &
       " --system " & JavaHome & " --class-path " & androidResourcePath & (when defined(windows): ";" else: ":") &