Update android_build.yml

kqlio67 · Nov 7, 2024 · 04bcd4e · 04bcd4e
1 parent 0e628b0
commit 04bcd4e
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/.github/workflows/android_build.yml b/.github/workflows/android_build.yml
@@ -61,28 +61,23 @@ jobs:
     - name: Setup Android SDK
       uses: android-actions/setup-android@v2
 
-    - name: Install Android SDK components
+    - name: Accept all SDK licenses
       run: |
         yes | sdkmanager --licenses
-        sdkmanager "platform-tools" "platforms;android-33" "build-tools;33.0.2"
-        sdkmanager "cmdline-tools;latest"
+        yes | sdkmanager "platform-tools" "platforms;android-33" "build-tools;33.0.2" "cmdline-tools;latest"
 
     - name: Manually Install AIDL
       run: |
         # Download Android SDK Command Line Tools
         wget https://dl.google.com/android/repository/commandlinetools-linux-10406996_latest.zip
-        unzip commandlinetools-linux-10406996_latest.zip
+        unzip commandlinetools-linux-10406996_latest.zip -d $ANDROID_HOME/cmdline-tools
+        mv $ANDROID_HOME/cmdline-tools/cmdline-tools $ANDROID_HOME/cmdline-tools/latest
         
-        # Create necessary SDK directory structure
-        mkdir -p $ANDROID_HOME/cmdline-tools
-        mv cmdline-tools $ANDROID_HOME/cmdline-tools/latest
-        
-        # Update PATH
+        # Update PATH to include command-line tools
         export PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest/bin
         
         # Install additional SDK components
-        yes | sdkmanager "build-tools;33.0.2"
-        yes | sdkmanager "platforms;android-33"
+        yes | sdkmanager "build-tools;33.0.2" "platforms;android-33"
         
         # Verify AIDL installation
         $ANDROID_HOME/build-tools/33.0.2/aidl --version || echo "AIDL installation failed"
@@ -97,6 +92,7 @@ jobs:
 
     - name: Prepare Buildozer environment
       run: |
+        export ANDROID_HOME=$HOME/android-sdk
         pip install --upgrade buildozer
         pip install --upgrade cython
         python -m pip install --upgrade pip