fix android env in the most stupid way
This commit is contained in:
+2
-2
@@ -10,7 +10,7 @@ build-android:
|
||||
- $HOME/go
|
||||
script: |
|
||||
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
|
||||
git submodule update --init --recursive
|
||||
git tag v$version -f
|
||||
@@ -23,7 +23,7 @@ build-android:
|
||||
cp *.aar clients/android/app/libs
|
||||
cd clients/android
|
||||
echo "Gonna build with ANDROID_HOME=$ANDROID_HOME"
|
||||
./gradlew :app:assembleOtherRelease :app:assembleOtherLegacyRelease
|
||||
ANDROID_HOME="$HOME/Android/Sdk" ./gradlew :app:assembleOtherRelease :app:assembleOtherLegacyRelease
|
||||
cd ../..
|
||||
mkdir -p dist # prepare upload
|
||||
cp clients/android/app/build/outputs/apk/other/release/*.apk dist
|
||||
|
||||
@@ -22,9 +22,3 @@ sdkmanager \
|
||||
"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
|
||||
Reference in New Issue
Block a user