Issue 3133 - Always perform a clobber before building

build.py

Index: build.py
===================================================================
--- a/build.py
+++ b/build.py
@@ -13,8 +13,8 @@
 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("""\
@@ -60,14 +60,14 @@
   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"))