Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 06:24:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #14928 from jherico/fix/android_release_apk

Browse source 
Fix android release build APK
This commit is contained in:
Sam Gateau 2019-02-15 14:11:51 -08:00 committed by GitHub
commit 70c085dfab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/build_android.sh
View file

@ -3,7 +3,7 @@ set -xeuo pipefail
./gradlew -PHIFI_ANDROID_PRECOMPILED=${HIFI_ANDROID_PRECOMPILED} -PVERSION_CODE=${VERSION_CODE} -PRELEASE_NUMBER=${RELEASE_NUMBER} -PRELEASE_TYPE=${RELEASE_TYPE} ${ANDROID_APP}:${ANDROID_BUILD_TARGET} ./gradlew -PHIFI_ANDROID_PRECOMPILED=${HIFI_ANDROID_PRECOMPILED} -PVERSION_CODE=${VERSION_CODE} -PRELEASE_NUMBER=${RELEASE_NUMBER} -PRELEASE_TYPE=${RELEASE_TYPE} ${ANDROID_APP}:${ANDROID_BUILD_TARGET}
# This is the actual output from gradle, which no longer attempts to muck with the naming of the APK # This is the actual output from gradle, which no longer attempts to muck with the naming of the APK
OUTPUT_APK=./apps/${ANDROID_APP}/build/outputs/apk/${ANDROID_BUILD_DIR}/${ANDROID_APP}-${ANDROID_BUILD_DIR}.apk OUTPUT_APK=./apps/${ANDROID_APP}/build/outputs/apk/${ANDROID_BUILD_DIR}/${ANDROID_BUILT_APK_NAME}
# This is the APK name requested by Jenkins # This is the APK name requested by Jenkins
TARGET_APK=./${ANDROID_APK_NAME} TARGET_APK=./${ANDROID_APK_NAME}
# Make sure this matches up with the new ARTIFACT_EXPRESSION for jenkins builds, which should be "android/*.apk" # Make sure this matches up with the new ARTIFACT_EXPRESSION for jenkins builds, which should be "android/*.apk"

1
android/containerized_build.sh
View file

@ -16,6 +16,7 @@ docker run \
-e RELEASE_NUMBER \ -e RELEASE_NUMBER \
-e RELEASE_TYPE \ -e RELEASE_TYPE \
-e ANDROID_APP \ -e ANDROID_APP \
-e ANDROID_BUILT_APK_NAME \
-e ANDROID_APK_NAME \ -e ANDROID_APK_NAME \
-e ANDROID_BUILD_TARGET \ -e ANDROID_BUILD_TARGET \
-e ANDROID_BUILD_DIR \ -e ANDROID_BUILD_DIR \