icybear/omv-dijiang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix android env in the most stupid way

Browse Source
This commit is contained in:
n3t1zen
2026-05-04 15:52:35 +08:00
parent b1eb93eac0
commit df536c6f4a
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+2 -2
View File
@@ -10,7 +10,7 @@ build-android:
- $HOME/go - $HOME/go
script: | script: |
export version="$(git describe --tags)-$CI_COMMIT_SHORT_SHA" && echo "building version $version" export version="$(git describe --tags)-$CI_COMMIT_SHORT_SHA" && echo "building version $version"
bash ./setup-ndk.sh && source ./android.env bash ./setup-ndk.sh
bin/update && bin/apply-ci && cd works/core bin/update && bin/apply-ci && cd works/core
git submodule update --init --recursive git submodule update --init --recursive
git tag v$version -f git tag v$version -f
@@ -23,7 +23,7 @@ build-android:
cp *.aar clients/android/app/libs cp *.aar clients/android/app/libs
cd clients/android cd clients/android
echo "Gonna build with ANDROID_HOME=$ANDROID_HOME" echo "Gonna build with ANDROID_HOME=$ANDROID_HOME"
./gradlew :app:assembleOtherRelease :app:assembleOtherLegacyRelease ANDROID_HOME="$HOME/Android/Sdk" ./gradlew :app:assembleOtherRelease :app:assembleOtherLegacyRelease
cd ../.. cd ../..
mkdir -p dist # prepare upload mkdir -p dist # prepare upload
cp clients/android/app/build/outputs/apk/other/release/*.apk dist cp clients/android/app/build/outputs/apk/other/release/*.apk dist
setup-ndk.sh
+1 -7
View File
@@ -21,10 +21,4 @@ sdkmanager \
"build-tools;34.0.0" \ "build-tools;34.0.0" \
"ndk;28.0.12433566" "ndk;28.0.12433566"
export ANDROID_NDK_HOME="$ANDROID_HOME/ndk/28.0.12433566" export ANDROID_NDK_HOME="$ANDROID_HOME/ndk/28.0.12433566"
echo "
ANDROID_HOME=$ANDROID_HOME
ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT
ANDROID_NDK_HOME=$ANDROID_NDK_HOME
" > android.env