Skip to content

Commit cdee482

Browse files
committed
contrib/android: stop overriding versionCode with ABI's ones
This was only needed when publishing different APK per ABI on Play Store. We only publish a single bundle now, a single versionCode is enough. Bump it to 80274 to match the last ABI versionCode. Signed-off-by: Brice Goglin <[email protected]> (cherry picked from commit 4cb7838)
1 parent d7ec3c2 commit cdee482

File tree

1 file changed

+1
-15
lines changed

1 file changed

+1
-15
lines changed

contrib/android/AndroidApp/lstopo/build.gradle

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ android {
88
targetSdkVersion 33
99
ndkVersion "26.1.10909125"
1010
// Increase versionCode whenever you publish a new Android release
11-
versionCode 264
11+
versionCode 80274
1212
// Official hwloc version - snapshot number - android apk version
1313
// Set snapshot number to 1 when the hwloc version is increased.
1414
// Increase the snapshot number when the hwloc code changed but not its version
@@ -60,20 +60,6 @@ android {
6060
}
6161
}
6262

63-
// map for the version code that gives each ABI a value. make sure to list all ABIs mentioned in splits block, an keep the order.
64-
ext.versionCodes = ['armeabi': 3, 'armeabi-v7a': 4, 'arm64-v8a': 5, mips: 6, 'x86': 7, 'x86_64': 8]
65-
import com.android.build.OutputFile
66-
67-
// For each APK output variant, override versionCode with a combination of
68-
// ABI APK value * 100xx + defaultConfig.versionCode
69-
android.applicationVariants.all { variant ->
70-
// assign different version code for each output
71-
variant.outputs.each { output ->
72-
output.versionCodeOverride =
73-
project.ext.versionCodes.get(output.getFilter(OutputFile.ABI)) * 10000 + android.defaultConfig.versionCode
74-
}
75-
}
76-
7763
dependencies {
7864
implementation fileTree(dir: 'libs', include: ['*.jar'])
7965
implementation 'androidx.appcompat:appcompat:1.3.0-alpha02'

0 commit comments

Comments
 (0)