filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enable split ABI support 

https://github.com/SchildiChat/SchildiChat-android/issues/183

Change-Id: Ia8eff01c973d365d6d4a4390153f23510ab77e0e
This commit is contained in:
SpiritCroc 2023-07-21 12:21:19 +02:00
parent 5f37ffd330
commit 92e9d9e747
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
increment_version.sh
View File

@ -23,6 +23,8 @@ fi
if [ "$1" = "test" ]; then if [ "$1" = "test" ]; then
release_type="test" release_type="test"
previousTestVersionCode="$2" previousTestVersionCode="$2"
# Remove last digit for internal version codes without split ABI
previousTestVersionCode=`echo "$previousTestVersionCode" | sed 's|[0-9]$||'`
else else
release_type="normal" release_type="normal"
fi fi
@ -91,8 +93,9 @@ if [ "$release_type" = "test" ]; then
else else
versionCode=$((previousVersionCode + 10)) versionCode=$((previousVersionCode + 10))
# Ensure the new version code is higher than the one of the last test version # Ensure the new version code is higher than the one of the last test version
# Note that `versionCode` from build.gradle is before multiplying with 10 for split ABI, so here we remove the last digit
if [ -f "$HOME/fdroid/sm/data/metadata/de.spiritcroc.riotx.x.yml" ]; then if [ -f "$HOME/fdroid/sm/data/metadata/de.spiritcroc.riotx.x.yml" ]; then
lastTestVersionCode="$(cat "$HOME/fdroid/sm/data/metadata/de.spiritcroc.riotx.x.yml"|grep versionCode|tail -n 1|sed 's|.*: ||')" lastTestVersionCode="$(cat "$HOME/fdroid/sm/data/metadata/de.spiritcroc.riotx.x.yml"|grep versionCode|tail -n 1|sed 's|.*: ||;s|[0-9]$||')"
else else
read -p "Enter versionCode of last test version: " lastTestVersionCode read -p "Enter versionCode of last test version: " lastTestVersionCode
fi fi
@ -111,7 +114,8 @@ fi
new_tag="sc_v$version" new_tag="sc_v$version"
if ((preview)); then if ((preview)); then
echo "versionCode $versionCode" # Append 0 for universal apk
echo "versionCode ${versionCode}0"
echo "versionName $version" echo "versionName $version"
exit 0 exit 0
fi fi

4
vector-app/build.gradle
View File

@ -156,7 +156,7 @@ android {
renderscriptTargetApi 24 renderscriptTargetApi 24
renderscriptSupportModeEnabled true renderscriptSupportModeEnabled true
versionCode 40101090 versionCode 4010110
versionName "1.6.3.sc69" versionName "1.6.3.sc69"
// Generate a random app task affinity // Generate a random app task affinity
@ -194,7 +194,6 @@ android {
} }
} }
/*
applicationVariants.all { variant -> applicationVariants.all { variant ->
// assign different version code for each output // assign different version code for each output
def baseVariantVersion = variant.versionCode * 10 def baseVariantVersion = variant.versionCode * 10
@ -207,7 +206,6 @@ android {
output.outputFileName = output.outputFileName.replace("vector-app", "vector") output.outputFileName = output.outputFileName.replace("vector-app", "vector")
} }
} }
*/
// The following argument makes the Android Test Orchestrator run its // The following argument makes the Android Test Orchestrator run its
// "pm clear" command after each test invocation. This command ensures // "pm clear" command after each test invocation. This command ensures