Fix version code for branded fat builds.

lavabit · Apr 24, 2021 · 8c94aa1 · 8c94aa1
1 parent 78ba1ec
commit 8c94aa1
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -560,9 +560,12 @@ android.applicationVariants.all { variant ->
       if (!branding.productFlavor.name.contains("normal") && branding.versionCode != null && branding.versionCode > 0 && abiDimension.abiVersionCode > 0) {
           output.versionCodeOverride = branding.versionCode * 1000 + abiDimension.abiVersionCode
       }
-      else if (abiDimension.abiVersionCode > 0) {
+      else if (branding.productFlavor.name.contains("normal") && abiDimension.abiVersionCode > 0) {
           output.versionCodeOverride = android.defaultConfig.versionCode * 1000 + abiDimension.abiVersionCode
       }
+      else if (branding.versionCode != null && branding.versionCode > 0) {
+        output.versionCodeOverride = branding.versionCode
+      }
   }
 
   // remove unrelated abi specific assets