Issue 5805 - Add standalone suffix to the apk name of multi-locale builds

build.py

Index: build.py
===================================================================
--- a/build.py
+++ b/build.py
@@ -83,22 +83,24 @@ def _build(architecture, distribution_mo
     arch_suffix = _ARCH_X86_I386 if architecture == _ARCH_X86 else _ARCH_ARM
     [manifest_path] = glob.glob(os.path.join(
         dist_path, "fennec-*.multi.android-%s.json" % arch_suffix))
     with open(manifest_path) as manifest_file:
         manifest = json.load(manifest_file)
     apk_name = "fennec-%s.multi.android-%s-unsigned-unaligned.apk" % (
             manifest["moz_app_version"], architecture)
     apk_path = os.path.join(dist_path, apk_name)
-    if build_mode == _BUILD_RELEASE:
-        target_apk_name = "adblockbrowser-%s-%s.apk" % (
-            manifest["moz_app_version"], architecture)
-    else:
-        target_apk_name = "adblockbrowser-%s.%s-%s.apk" % (
-            manifest["moz_app_version"], manifest["buildid"], architecture)
+    build_suffix = ("-%s" % manifest["buildid"]
+                    if build_mode == _BUILD_DEVBUILD
+                    else "")
+    dist_suffix = ("-%s" % _DIST_STANDALONE
+                   if distribution_mode == _DIST_STANDALONE
+                   else "")
+    target_apk_name = "adblockbrowser-%s%s-%s%s.apk" % (
+        manifest["moz_app_version"], build_suffix, architecture, dist_suffix)
     target_apk_path = os.path.join(dist_path, target_apk_name)
     shutil.copyfile(apk_path, target_apk_path)
 
     target_manifest_path = re.sub(r".apk$", ".json", target_apk_path)
     shutil.copyfile(manifest_path, target_manifest_path)
 
     return target_apk_path