summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2022-12-16 14:57:48 +0000
committercyberta <cyberta@riseup.net>2022-12-16 14:57:48 +0000
commit8f78e99da489578f226c3aa19bcc204f33f328b9 (patch)
treeee3921daea5b695b31b126a546dfce78e1efff67
parent2ee51920cab4060f104e11007f65172fcf7f6e6a (diff)
parentc49366aa8757b97c249b011eefbe824e52a7d418 (diff)
Merge branch 'remove_insecure_custom_builds' into 'master'
remove custom+insecure flavored builds Closes #9086 See merge request leap/bitmask_android!231
-rw-r--r--app/build.gradle3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 6c1bf394..1fa344b8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -344,7 +344,6 @@ android {
* normalProductionFatDebug -> Bitmask development build, includes all ABIS
* customProductionFatwebDebug -> branded development build, includes all ABIs, for distribution through a download page
* normalProductionFatWebDebug -> Bitmask development build, includes all ABIS, for distribution through a download page
- * customInsecureFatDebug -> branded development build, doesn't checks certificates (for test server setup w/o valid certificates), includes all ABIs
* normalInsecureFatDebug -> Bitmask development build, doesn't checks certificates (for test server setup w/o valid certificates), includes all ABIs
*
* Branded Releases:
@@ -377,10 +376,12 @@ android {
def buildTypeName = variant.buildType.name
// flavorDimensions "branding" -> 0, "implementation" -> 1, "abi" -> 2
def supportsSplitApk = variant.flavors[0].splitApk
+ def branding = variant.flavors[0].name
// To check for a certain build type, use variant.buildType.name == "<buildType>"
if (((names.contains("insecure") && !names.contains("fat")) ||
(names.contains("insecure") && buildTypeName.contains("beta")) ||
(names.contains("insecure") && buildTypeName.contains("release")) ||
+ (names.contains("insecure") && branding.contains("custom")) ||
(buildTypeName.contains("debug") && !(names.contains("fatweb") || names.contains("fat"))) ||
(names.contains("fatweb") && buildTypeName.contains("beta")) ||
(!supportsSplitApk && !names.contains("fat")))