test

zeroc-ice · Dec 18, 2024 · f6877ee · f6877ee
1 parent 97f6a9f
commit f6877ee
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/.github/actions/setup-dependencies/action.yml b/.github/actions/setup-dependencies/action.yml
@@ -120,21 +120,21 @@ runs:
       shell: bash
       run: |
         wget https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip -O /tmp/android-sdk.zip
-        mkdir -p /opt/android-sdk/cmdline-tools
-        unzip -q /tmp/android-sdk.zip -d /opt/android-sdk/cmdline-tools
+        mkdir -p /opt/android-sdk/
+        unzip -q /tmp/android-sdk.zip -d /opt/android-sdk
         rm /tmp/android-sdk.zip
-        mv /opt/android-sdk/cmdline-tools/cmdline-tools /opt/android-sdk/cmdline-tools/latest
-        export ANDROID_HOME=/opt/android-sdk/cmdline-tools/latest
+        mv /opt/android-sdk/cmdline-tools/ /opt/android-sdk/tools
+        export ANDROID_HOME=/opt/android-sdk/
         echo "ANDROID_HOME=$ANDROID_HOME" >> $GITHUB_ENV
         echo "ANDROID_SDK_ROOT=$ANDROID_HOME" >> $GITHUB_ENV
-        echo "$ANDROID_HOME/bin" >> $GITHUB_PATH
+        echo "$ANDROID_HOME/tools/bin" >> $GITHUB_PATH
       if: matrix.config == 'android'
 
     - name: Configure Android SDK
       shell: bash
       run: |
         bash -c 'yes 2>/dev/null | sdkmanager --licenses'
-        cp -r /opt/android-sdk/licenses $ANDROID_HOME/licenses
+        # cp -r /opt/android-sdk/licenses $ANDROID_HOME/licenses
         sdkmanager "platform-tools" "build-tools;33.0.2" "platforms;android-33"
         # sdkmanager "extras;intel;Hardware_Accelerated_Execution_Manager"
         sdkmanager "system-images;android-33;google_apis;x86_64"