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

build.py

Index: build.py
===================================================================
--- a/build.py
+++ b/build.py
@@ -80,18 +80,19 @@ def _build(architecture, distribution_mo
                           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)
@@ -134,17 +135,17 @@ if __name__ == "__main__":
         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)