andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-22 02:01:08 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

Cleanup commented code

Browse Source
This commit is contained in:
Mykola Baibuz
2023-06-23 05:56:19 -04:00
parent 7504d900d0
commit bd18795a00
2 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/deploy.yml
+3 -7
View File
@@ -257,10 +257,6 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
continue-on-error: true continue-on-error: true
strategy:
matrix:
arch: ['android_x86_64'] #, 'android_x86'] #, 'android_armv7', 'android_arm64_v8a']
env: env:
QT_VERSION: 6.5.0 QT_VERSION: 6.5.0
@@ -284,7 +280,7 @@ jobs:
version: ${{ env.QT_VERSION }} version: ${{ env.QT_VERSION }}
host: 'linux' host: 'linux'
target: 'android' target: 'android'
arch: ${{ matrix.arch }} arch: 'android_x86_64'
modules: 'qtremoteobjects qt5compat qtimageformats qtshadertools' modules: 'qtremoteobjects qt5compat qtimageformats qtshadertools'
dir: ${{ runner.temp }} dir: ${{ runner.temp }}
setup-python: 'true' setup-python: 'true'
@@ -318,12 +314,12 @@ jobs:
export ANDROID_NDK_PLATFORM=android-23 export ANDROID_NDK_PLATFORM=android-23
export ANDROID_NDK_HOME=${{ runner.temp }}/android-ndk-r${NDK_VERSION} export ANDROID_NDK_HOME=${{ runner.temp }}/android-ndk-r${NDK_VERSION}
export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME
export ANDROID_CURRENT_ARCH=${{ matrix.arch }} export ANDROID_CURRENT_ARCH=android_x86_64
if [ ! -f $ANDROID_NDK_ROOT/ndk-build ]; then if [ ! -f $ANDROID_NDK_ROOT/ndk-build ]; then
wget https://dl.google.com/android/repository/android-ndk-r${NDK_VERSION}-linux.zip -qO ${{ runner.temp }}/ndk.zip && wget https://dl.google.com/android/repository/android-ndk-r${NDK_VERSION}-linux.zip -qO ${{ runner.temp }}/ndk.zip &&
unzip -q -d ${{ runner.temp }} ${{ runner.temp }}/ndk.zip ; unzip -q -d ${{ runner.temp }} ${{ runner.temp }}/ndk.zip ;
fi fi
export QT_BIN_DIR=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/${{ matrix.arch }}/bin export QT_BIN_DIR=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/android_x86_64/bin
bash deploy/build_android.sh bash deploy/build_android.sh
client/android/build.gradle
-12
View File
@@ -173,18 +173,6 @@ android {
} }
} }
// externalNativeBuild {
// cmake {
// path 'wireguard/CMakeLists.txt'
// }
// }
// externalNativeBuild {
// cmake {
// version cmakeMinVersion
// path "${projectDir}/cpp/CMakeLists.txt"
// }
// }
} }