Issue 2751 - Move signing options to config.py

build.py

 #!/usr/bin/env python
 
 import glob
 import json
 import os
 import shutil
 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")
 DIST_PATH = os.path.join(BASE_DIR, "adblockbrowser",
                          "obj-arm-linux-androideabi", "dist")
 
 def print_usage():
-  print >>sys.stderr, "Usage: %s devbuild|release KEY_STORE KEY_NAME" % \
+  print >>sys.stderr, "Usage: %s devbuild|release" % \
     os.path.basename(sys.argv[0])
 
 def check_mozconfig(path, mode):
   if not os.path.exists(path):
     raise Exception("'%s' doesn't exist, please create it." % path)
 
   with open(path) as file:
     contents = file.read()
 
   # This check can be removed once https://issues.adblockplus.org/ticket/2490 is
@@ skipping 11 matching lines @@
     raise Exception("'%s' seems to set --disable-updater, please don't." % path)
   elif not updater_disabled and mode == "release":
     raise Exception(
       "'%s' doesn't seem to set --disable-updater, please do." % path)
 
 def find_mozconfig(mode):
   mozconfig_path = os.path.join(BASE_DIR, "mozconfig-" + mode)
   check_mozconfig(mozconfig_path, mode)
   return mozconfig_path
 
-def build(mode):
+def build(mode, sdk_path, ndk_path):
   mozharness_environment = os.environ.copy()
   mozharness_environment["MOZCONFIG"] = find_mozconfig(mode)
-  import config
-  mozharness_environment["ANDROID_SDK_PATH"] = config.ANDROID_SDK_PATH
-  mozharness_environment["ANDROID_NDK_PATH"] = config.ANDROID_NDK_PATH
+  mozharness_environment["ANDROID_SDK_PATH"] = sdk_path
+  mozharness_environment["ANDROID_NDK_PATH"] = ndk_path
 
   subprocess.check_call([MULTI_L10N_PATH, "--cfg", "adblockbrowser-cfg.py"],
                         env=mozharness_environment)
 
   [manifest_path] = glob.glob(os.path.join(
     DIST_PATH, "fennec-*.multi.android-arm.json"))
   with open(manifest_path) as manifest_file:
     manifest = json.load(manifest_file)
 
   apk_path = os.path.join(DIST_PATH, "gecko-unsigned-unaligned.apk")
@@ skipping 12 matching lines @@
   try:
     subprocess.check_call(["jarsigner", "-verbose", "-sigalg", "SHA1withRSA",
                            "-digestalg", "SHA1", "-keystore", key_store,
                            temp_apk_path, key_name])
     os.remove(apk_path)
     subprocess.check_call(["zipalign", "-v", "4", temp_apk_path, apk_path])
   finally:
     os.remove(temp_apk_path)
 
 if __name__ == "__main__":
-  if len(sys.argv) < 4:
+  if len(sys.argv) < 2:
     print_usage()
     sys.exit(1)
 
-  mode, key_store, key_name = sys.argv[1:]
+  mode = sys.argv[1]
   if mode not in ("devbuild", "release"):
     print_usage()
     sys.exit(2)
 
   subprocess.check_call([ENSURE_DEPENDENCIES_PATH])
-  apk_path = build(mode)
-  sign(apk_path, key_store, key_name)
+  import config
+  apk_path = build(mode, config.ANDROID_SDK_PATH, config.ANDROID_NDK_PATH)
+  sign(apk_path, config.ANDROID_KEYSTORE_PATH, config.ANDROID_KEY_NAME)