Issue 3319 - Save build manifest with the same base name as the APK

build.py

 #!/usr/bin/env python
 
 import glob
 import json
 import os
+import re
 import shutil
 import string
 import subprocess
 import sys
 import tempfile
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 ENSURE_DEPENDENCIES_PATH = os.path.join(BASE_DIR, "ensure_dependencies.py")
 MULTI_L10N_PATH = os.path.join(BASE_DIR, "mozharness", "scripts",
                                "multil10n.py")
@@ skipping 59 matching lines @@
     manifest = json.load(manifest_file)
 
   apk_path = os.path.join(DIST_PATH, "gecko-unsigned-unaligned.apk")
   if build_mode == "release":
     target_apk_name = "adblockbrowser-%s-arm.apk" % manifest["moz_app_version"]
   else:
     target_apk_name = "adblockbrowser-%s.%s-arm.apk" % (
       manifest["moz_app_version"], manifest["buildid"])
   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
 
 def sign(apk_path, key_store, key_name):
   temp_apk_path = tempfile.NamedTemporaryFile().name
   shutil.copyfile(apk_path, temp_apk_path)
   try:
     subprocess.check_call(["jarsigner", "-verbose", "-sigalg", "SHA1withRSA",
                            "-digestalg", "SHA1", "-keystore", key_store,
                            temp_apk_path, key_name])
     os.remove(apk_path)
@@ skipping 32 matching lines @@
     print >>sys.stderr, "Invalid build mode, check config.py"
     sys.exit(5)
 
   if do_build:
     apk_path = build(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)
   else:
     print apk_path