From d79ac8eff456a030eaad07250f35f6018ee3da1c Mon Sep 17 00:00:00 2001
From: Alexander Kacheryants <kacheryants30@gmail.com>
Date: Sat, 13 Jul 2024 05:26:47 +0300
Subject: [PATCH] dada

---
 .gitea/workflows/test-make.yaml | 51 +++++++++++++++++----------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/.gitea/workflows/test-make.yaml b/.gitea/workflows/test-make.yaml
index 452aea1..e8ef2a4 100644
--- a/.gitea/workflows/test-make.yaml
+++ b/.gitea/workflows/test-make.yaml
@@ -40,35 +40,36 @@ jobs:
           cat $ANDROID_HOME
         shell: bash
 
-      # - name: Setup Android SDK
-        # uses: android-actions/setup-android@v3
-        # with:
-          # packages: 'platform-tools'
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+        with:
+          packages: 'platform-tools'
 
       # https://github.com/lzhiyong/android-sdk-tools/releases
-      # - name: Install ADB
-        # continue-on-error: true
-        # run: |
-          # curl --compressed --location --output tools.zip https://github.com/lzhiyong/android-sdk-tools/releases/download/34.0.3/android-sdk-tools-static-aarch64.zip
-          # unzip -d tools -n -q tools.zip
-          # rm -f tools.zip
-          # cp tools/platform-tools/adb $ANDROID_HOME/platform-tools/adb
-          # rm -fr tools
-        # shell: bash
+      - name: Install ADB
+        continue-on-error: true
+        run: |
+          curl --compressed --location --output tools.zip https://github.com/lzhiyong/android-sdk-tools/releases/download/34.0.3/android-sdk-tools-static-aarch64.zip
+          unzip -d tools -n -q tools.zip
+          rm -f tools.zip
+          cp tools/platform-tools/adb $ANDROID_HOME/platform-tools/adb
+          cp tools/build-tools/aapt $ANDROID_HOME/build-tools/aapt
+          rm -fr tools
+        shell: bash
 
       # https://ci.android.com/builds/branches/aosp-emu-master-dev/grid
-      # - name: Install Emulator
-      #   run: |
-      #     curl --compressed --location --output emulator.zip $(curl --location --silent https://ci.android.com/builds/submitted/11162281/emulator-linux_aarch64/latest/sdk-repo-linux_aarch64-emulator-11162281.zip | grep -o 'https://storage[^"]*' | sed 's/\\u0026/\&/g')
-      #     unzip -d $ANDROID_HOME -n -q emulator.zip
-      #     rm -f emulator.zip
-      #     cp $ANDROID_HOME/platform-tools/package.xml $ANDROID_HOME/emulator/package.xml
-      #     sed -i \
-      #       -e 's|path="[a-zA-Z-]*"|path="emulator"|g' \
-      #       -e 's|<display-name>Android .*<\/display-name>|<display-name>Android Emulator<\/display-name>|g' \
-      #       $ANDROID_HOME/emulator/package.xml
-      #     echo 'Vulkan = off\nGLDirectMem = on' >> ~/.android/advancedFeatures.ini
-      #   shell: bash
+      - name: Install Emulator
+        run: |
+          curl --compressed --location --output emulator.zip $(curl --location --silent https://ci.android.com/builds/submitted/11162281/emulator-linux_aarch64/latest/sdk-repo-linux_aarch64-emulator-11162281.zip | grep -o 'https://storage[^"]*' | sed 's/\\u0026/\&/g')
+          unzip -d $ANDROID_HOME -n -q emulator.zip
+          rm -f emulator.zip
+          cp $ANDROID_HOME/platform-tools/package.xml $ANDROID_HOME/emulator/package.xml
+          sed -i \
+            -e 's|path="[a-zA-Z-]*"|path="emulator"|g' \
+            -e 's|<display-name>Android .*<\/display-name>|<display-name>Android Emulator<\/display-name>|g' \
+            $ANDROID_HOME/emulator/package.xml
+          echo 'Vulkan = off\nGLDirectMem = on' >> ~/.android/advancedFeatures.ini
+        shell: bash
 
       - name: Install SDK Tools
         run: |