Bug 1122772 - Remove the code used to support unified builds from moz…

…harness; r=jlund
mozilla · Jan 22, 2015 · c9ff249 · c9ff249
1 parent dc402cc
commit c9ff249
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 185 deletions.
diff --git a/configs/builds/releng_sub_linux_configs/64_debug_and_non_unified.py b/configs/builds/releng_sub_linux_configs/64_debug_and_non_unified.py
diff --git a/configs/builds/releng_sub_linux_configs/64_non_unified.py b/configs/builds/releng_sub_linux_configs/64_non_unified.py
diff --git a/configs/builds/releng_sub_mac_configs/64_debug_and_non_unified.py b/configs/builds/releng_sub_mac_configs/64_debug_and_non_unified.py
diff --git a/configs/builds/releng_sub_mac_configs/64_non_unified.py b/configs/builds/releng_sub_mac_configs/64_non_unified.py
diff --git a/configs/builds/releng_sub_windows_configs/32_debug_and_non_unified.py b/configs/builds/releng_sub_windows_configs/32_debug_and_non_unified.py
diff --git a/configs/builds/releng_sub_windows_configs/32_non_unified.py b/configs/builds/releng_sub_windows_configs/32_non_unified.py
diff --git a/mozharness/mozilla/building/buildbase.py b/mozharness/mozilla/building/buildbase.py
@@ -268,7 +268,7 @@ class BuildOptionParser(object):
     ]
 
     # add to this list and you can automagically do things like
-    # --custom-build-variant non-unified
+    # --custom-build-variant asan
     # and the script will pull up the appropriate path for the config
     # against the current platform and bits.
     # *It will warn and fail if there is not a config for the current
@@ -278,9 +278,6 @@ class BuildOptionParser(object):
         'debug': 'builds/releng_sub_%s_configs/%s_debug.py',
         'asan-and-debug': 'builds/releng_sub_%s_configs/%s_asan_and_debug.py',
         'stat-and-debug': 'builds/releng_sub_%s_configs/%s_stat_and_debug.py',
-        'non-unified': 'builds/releng_sub_%s_configs/%s_non_unified.py',
-        'debug-and-non-unified':
-                'builds/releng_sub_%s_configs/%s_debug_and_non_unified.py',
         'mulet': 'builds/releng_sub_%s_configs/%s_mulet.py',
         'code-coverage': 'builds/releng_sub_%s_configs/%s_code_coverage.py',
     }

diff --git a/scripts/b2g_build.py b/scripts/b2g_build.py
@@ -101,11 +101,6 @@ class B2GBuild(LocalesMixin, PurgeMixin,
             "action": "store_true",
             "help": "Set B2G_DEBUG=1 (debug build)",
         }],
-        [["--non-unified"], {
-            "dest": "nonunified_build",
-            "action": "store_true",
-            "help": "Set MOZ_NON_UNIFIED=1 (non-unified build)",
-        }],
         [["--repotool-repo"], {
             "dest": "repo_repo",
             "help": "where to pull repo tool source from",
@@ -267,8 +262,6 @@ def query_do_upload(self):
             return True
         if self.config['target'] in self.config['upload']['default'].get('upload_dep_target_exclusions', []):
             return False
-        if self.config.get('nonunified_build'):
-            return False
         return True
 
     def query_build_env(self):
@@ -281,8 +274,6 @@ def query_build_env(self):
         env['FORCE_GECKO_BUILD_OUTPUT'] = '1'
         if self.config.get('debug_build'):
             env['B2G_DEBUG'] = '1'
-        if self.config.get('nonunified_build'):
-            env['MOZ_NON_UNIFIED'] = '1'
         return env
 
     def query_dotconfig(self):