diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
index 80ac9d9c..dfd3fab6 100644
--- a/.github/workflows/build-android.yml
+++ b/.github/workflows/build-android.yml
@@ -39,7 +39,7 @@ jobs:
           dir: ${{ github.workspace }}
           modules: ${{env.QT_MODULES}}
           version: ${{ matrix.version }}
-      - name: CMake for Android
+      - name: Configure for android
         shell: cmd
         run: |
           git fetch --tags
@@ -55,7 +55,7 @@ jobs:
           -DANDROID_NDK_ROOT:PATH="%ANDROID_NDK_ROOT%" ^
           -DBUILD_SHARED_LIBS:BOOL=OFF ^
           -DWITH_TOOLS:BOOL=OFF
-      - name: Directory of build\armeabi_v7a
+      - name: Dir build\armeabi_v7a
         shell: cmd
         run: dir build\armeabi_v7a
       - name: Build for android
@@ -84,6 +84,7 @@ jobs:
           ${{ github.workspace }}\Qt\${{ matrix.version }}\mingw_64\bin\androiddeployqt.exe ^
           --input build\armeabi_v7a\android-xTools-deployment-settings.json ^
           --output build\armeabi_v7a\android-build ^
-          --android-platform android-23 ^
+          --android-platform android-35 ^
           --jdk %JAVA_HOME% --gradle --release
-          #--sign ${{ github.workspace }}\res\android\android_release.keystore %secrets.ANDROID_RELEASE_KEYS% --storepass  %secrets.ANDROID_RELEASE_KEYS%  --keypass %secrets.ANDROID_RELEASE_KEYS%  ^
+
+        # --sign ${{ github.workspace }}\res\android\android_release.keystore %secrets.ANDROID_RELEASE_KEYS% --storepass  %secrets.ANDROID_RELEASE_KEYS%  --keypass %secrets.ANDROID_RELEASE_KEYS%  ^
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index bd206200..8b96dd50 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -1,33 +1,34 @@
-name: build environment
+name: build-test
 on:
  push:
    branches:
      - master
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  QT_ANDROID_KEYSTORE_PATH: ${{ github.workspace }}\res\android\android_release.keystore
+  QT_ANDROID_KEYSTORE_ALIAS: ${{ secrets.ANDROID_KEYSTORE_ALIAS }}
+  QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.ANDROID_KEYSTORE_STORE_PASS }}
+  QT_ANDROID_KEYSTORE_KEY_PASS: ${{ secrets.ANDROID_KEYSTORE_KEY_PASS }}
 jobs:
   Windows:
     name: Windows Test
     runs-on: windows-latest
-    env:
-      QT_ANDROID_KEYSTORE_ALIAS: ${{ secrets.ANDROID_KEYSTORE_ALIAS }}
-      QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.ANDROID_KEYSTORE_STORE_PASS }}
-      QT_ANDROID_KEYSTORE_KEY_PASS: ${{ secrets.ANDROID_KEYSTORE_KEY_PASS }}
     steps:
       - name: echo
         shell: cmd
         run: |
-          echo "ANDROID_RELEASE_KEYS1: ${{ env.QT_ANDROID_KEYSTORE_ALIAS }}"
-          echo "ANDROID_RELEASE_KEYS2: ${{ env.QT_ANDROID_KEYSTORE_STORE_PASS }}"
-          echo "ANDROID_RELEASE_KEYS3: ${{ env.QT_ANDROID_KEYSTORE_KEY_PASS }}"
+          echo "QT_ANDROID_KEYSTORE_PATH: ${{ env.QT_ANDROID_KEYSTORE_PATH }}"
+          echo "QT_ANDROID_KEYSTORE_ALIAS: ${{ env.QT_ANDROID_KEYSTORE_ALIAS }}"
+          echo "QT_ANDROID_KEYSTORE_STORE_PASS: ${{ env.QT_ANDROID_KEYSTORE_STORE_PASS }}"
+          echo "QT_ANDROID_KEYSTORE_KEY_PASS: ${{ env.QT_ANDROID_KEYSTORE_KEY_PASS }}"
   Linux:
     name: Ubuntu Test
     runs-on: ubuntu-latest
     steps:
       - name: echo
         run: |
-          echo "ANDROID_RELEASE_KEYS1: ${{ env.QT_ANDROID_KEYSTORE_ALIAS }}"
-          echo "ANDROID_RELEASE_KEYS2: ${{ env.QT_ANDROID_KEYSTORE_STORE_PASS }}"
-          echo "ANDROID_RELEASE_KEYS3: ${{ env.QT_ANDROID_KEYSTORE_KEY_PASS }}"
-
+          echo "QT_ANDROID_KEYSTORE_PATH: ${{ env.QT_ANDROID_KEYSTORE_PATH }}"
+          echo "QT_ANDROID_KEYSTORE_ALIAS: ${{ env.QT_ANDROID_KEYSTORE_ALIAS }}"
+          echo "QT_ANDROID_KEYSTORE_STORE_PASS: ${{ env.QT_ANDROID_KEYSTORE_STORE_PASS }}"
+          echo "QT_ANDROID_KEYSTORE_KEY_PASS: ${{ env.QT_ANDROID_KEYSTORE_KEY_PASS }}"
 
diff --git a/scripts/android.bat b/scripts/android.bat
index b0ce92fd..a15e4822 100644
--- a/scripts/android.bat
+++ b/scripts/android.bat
@@ -1,4 +1,4 @@
-echo "Please run this script in the root directory of the scrcpy directory"
+echo "Please run this script in the root directory of the project"
 :: if build is exist, remove it
 :: if exist build rmdir /s /q build
 
@@ -9,11 +9,12 @@ set JAVA_HOME=D:\512\Android\Jdk\jdk-11.0.21+9
 set ANDROID_NDK_ROOT=D:\512\Android\Sdk\ndk\25.1.8937393
 set ANDROID_SDK_ROOT=D:\512\Android\Sdk
 
-:: Configure for Android
-echo "Configuring for Android..."
-D:\512\Qt\Qt\6.5.3\android_armv7\bin\qt-cmake.bat ^
+if not "%1" == "build" (
+  :: Configure for Android
+  echo "Configuring for Android..."
+  D:\512\Qt\Qt\6.5.3\android_armv7\bin\qt-cmake.bat ^
   -G "MinGW Makefiles" ^
-  -S ../ ^
+  -S . ^
   -B "build\armeabi_v7a" ^
   -DQT_HOST_PATH:PATH="D:\512\Qt\Qt\6.5.3\mingw_64" ^
   -DCMAKE_BUILD_TYPE:STRING=Release ^
@@ -22,10 +23,12 @@ D:\512\Qt\Qt\6.5.3\android_armv7\bin\qt-cmake.bat ^
   -DANDROID_NDK_ROOT:PATH="%ANDROID_NDK_ROOT%" ^
   -DBUILD_SHARED_LIBS:BOOL=OFF ^
   -DWITH_TOOLS:BOOL=OFF
+)
 
 :: Build for Android
 echo "Building for Android..."
-D:\512\Qt\Qt\6.5.3\android_armv7\bin\qt-cmake.bat --build build\armeabi_v7a --target xTools --config Release
+cmake --build build\armeabi_v7a --target xTools --config Release
+xcopy build\armeabi_v7a\libxTools_armeabi-v7a.so build\armeabi_v7a\libs\libxTools_armeabi-v7a.so /Y
 
 :: Generate APK
 set QT_ANDROID_KEYSTORE_PATH=res/android/android_release.keystore
@@ -37,4 +40,4 @@ echo "Generating APK..."
 D:\512\Qt\Qt\6.5.3\mingw_64\bin\androiddeployqt.exe ^
 --input build\armeabi_v7a\android-xTools-deployment-settings.json ^
 --output build\armeabi_v7a\android-build ^
---android-platform android-23
+--android-platform android-34