Issue 3133 - Always perform a clobber before building

build.py

 #!/usr/bin/env python
 
 import glob
 import json
 import os
 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")
-DIST_PATH = os.path.join(BASE_DIR, "adblockbrowser",
-                         "obj-arm-linux-androideabi", "dist")
+ABB_PATH = os.path.join(BASE_DIR, "adblockbrowser")
+DIST_PATH = os.path.join(ABB_PATH, "obj-arm-linux-androideabi", "dist")
 
 def print_usage():
   print >>sys.stderr, string.Template("""\
 Usage: $name build
        $name sign APK_PATH
        $name build-and-sign\
 """).substitute({"name": os.path.basename(sys.argv[0])})
 
 def check_mozconfig(path, distribution_mode, build_mode):
   if not os.path.exists(path):
@@ skipping 25 matching lines @@
   elif not release_build and build_mode == "release":
     raise Exception("'%s' should export ABB_RELEASE_BUILD=1." % path)
 
 def find_mozconfig(distribution_mode, build_mode):
   mozconfig_path = os.path.join(BASE_DIR, "mozconfig-" + distribution_mode +
                                 "-" + build_mode)
   check_mozconfig(mozconfig_path, distribution_mode, build_mode)
   return mozconfig_path
 
 def build(distribution_mode, build_mode, sdk_path, ndk_path):
-  mozharness_environment = os.environ.copy()
-  mozharness_environment["MOZCONFIG"] = find_mozconfig(distribution_mode,
-                                                       build_mode)
-  mozharness_environment["ANDROID_SDK_PATH"] = sdk_path
-  mozharness_environment["ANDROID_NDK_PATH"] = ndk_path
-
+  build_environment = os.environ.copy()
+  build_environment["MOZCONFIG"] = find_mozconfig(distribution_mode, build_mode)
+  build_environment["ANDROID_SDK_PATH"] = sdk_path
+  build_environment["ANDROID_NDK_PATH"] = ndk_path
+  subprocess.check_call([os.path.join(ABB_PATH, "mach"), "clobber"],

[René Jeschke, 2015/09/29 15:19:41]

Nit: there has been an empty line here, now it's gone. Intended or accident?

[Felix Dahlke, 2015/09/29 15:20:32]

Intended, but no strong opinion :P

+                        env=build_environment)
   subprocess.check_call([MULTI_L10N_PATH, "--cfg", "adblockbrowser-cfg.py"],
-                        env=mozharness_environment)
+                        env=build_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")
   if build_mode == "release":
     target_apk_name = "adblockbrowser-%s-arm.apk" % manifest["moz_app_version"]
   else:
@@ skipping 46 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