changeset: 2439:f88f39c23f51

parent: 2437:f5385d109228 user: Ben Hearsum <bhearsum@mozilla.com> date: Tue Jun 26 13:27:56 2012 -0400 summary: bug 767503: make project_branches.py work with new b2g builds. r=catlee,rail changeset: 2440:33fcb67951a8 tag: tip user: Ben Hearsum <bhearsum@mozilla.com> date: Tue Jun 26 13:28:14 2012 -0400 summary: bug 767528: disable / remove code for old-style b2g builds. r=catlee --HG-- branch : production-0.8
mozilla-releng · Jun 26, 2012 · 095d5e9 · 095d5e9
2 parents b7bcbec + 129d4de
commit 095d5e9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/common.py b/common.py
@@ -7,7 +7,7 @@ def getCodesighsPlatforms():
 def getSupportedPlatforms():
     return ('linux', 'linuxqt','linux64',
             'win32', 'macosx', 'macosx64',
-            'win64', 'android', 'b2g',
+            'win64', 'android',
             'gb_armv7a_gecko',)
 
 def getPlatformFtpDir(platform):

diff --git a/misc.py b/misc.py
@@ -1041,7 +1041,7 @@ def generateBranchObjects(config, name, secrets=None):
                 'stageProduct': pf['stage_product'],
                 'graphServer': config['graph_server'],
                 'graphSelector': config['graph_selector'],
-                'graphBranch': config.get('graph_branch', config['tinderbox_tree']),
+                'graphBranch': config.get('graph_branch', config.get('tinderbox_tree', None)),
                 'doBuildAnalysis': doBuildAnalysis,
                 'baseName': pf['base_name'],
                 'leakTest': leakTest,

diff --git a/process/factory.py b/process/factory.py
@@ -1236,18 +1236,13 @@ def addDoBuildSteps(self):
         command = ['make', '-f', 'client.mk', bldtgt,
                    WithProperties('MOZ_BUILD_DATE=%(buildid:-)s')]
 
-        # XXX Hack! 
-        bldenv=self.env.copy()
-        if 'b2g' in self.platform:
-            bldenv['gonk'] = WithProperties('%(basedir)s/build/gonk-toolchain')
-
         if self.profiledBuild:
             command.append('MOZ_PGO=1')
         self.addStep(MockCommand(
          name='compile',
          command=command,
          description=['compile'],
-         env=bldenv,
+         env=self.env,
          haltOnFailure=True,
          timeout=10800,
          # bug 650202 'timeout=7200', bumping to stop the bleeding while we diagnose