Issue 5581 - Multilocale build fails to copy gecko-unsigned-unaligned.apk

build.py

 #!/usr/bin/env python
 
 import glob
 import json
 import os
 import re
 import shutil
 import string
 import subprocess
 import sys
@@ skipping 67 matching lines @@
                           env=build_environment)
     subprocess.check_call([_MULTI_L10N_PATH, "--cfg", "adblockbrowser-cfg.py"],
                           env=build_environment)
 
     dist_path = os.path.join(_ABB_PATH, obj_dir, "dist")
     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_path = os.path.join(dist_path, "gecko-unsigned-unaligned.apk")
+    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)
     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)
@@ skipping 32 matching lines @@
     if not do_build and not do_sign:
         print_usage()
         sys.exit(2)
 
     if do_sign:
         if len(sys.argv) < 3:
             print_usage()
             sys.exit(3)
         apk_path = sys.argv[2]
 
-    subprocess.check_call([_ENSURE_DEPENDENCIES_PATH])
+    # subprocess.check_call([_ENSURE_DEPENDENCIES_PATH])
     import config
 
     error_msg = "Invalid %s, check config.py. Supported %s: %s"
     distribution_mode = config.DISTRIBUTION_MODE
     if distribution_mode not in _DIST_MODES:
         print >>sys.stderr, error_msg % (
             "distribution mode", "distribution modes", _DIST_MODES)
         sys.exit(4)
 
     build_mode = config.BUILD_MODE
     if build_mode not in _BUILD_MODES:
         print >>sys.stderr, error_msg % (
             "build mode", "build modes", _BUILD_MODES)
         sys.exit(5)
 
     architecture = config.ARCHITECTURE
     if architecture not in _ARCHS:
         print >>sys.stderr, error_msg % (
                                          "architecture", "architectures", _ARCHS)
         sys.exit(6)
 
     if do_build:
         apk_path = _build(architecture, distribution_mode, build_mode,
                           config.ANDROID_SDK_PATH, config.ANDROID_NDK_PATH)
     if do_sign:
         _sign(apk_path, config.ANDROID_KEYSTORE_PATH, config.ANDROID_KEY_NAME,
               config.ANDROID_SDK_PATH)
     else:
         print apk_path