Bug 1014751: Remove workaround for naming. r=aki
authorChris AtLee <catlee@mozilla.com>
Wed, 28 May 2014 16:40:47 -0400
changeset 2798 0082c2590ebf0c71162e7e727b6e7d84224a0b4e
parent 2797 6d39fa1de4b1d5b1ca1b2fa391e6e5d9cf30d800
child 2799 8b9eabcf33ce255ad44c2deff4b5b86b87463e0d
push id2088
push usercatlee@mozilla.com
push dateWed, 28 May 2014 20:41:08 +0000
reviewersaki
bugs1014751
Bug 1014751: Remove workaround for naming. r=aki
scripts/b2g_build.py
--- a/scripts/b2g_build.py
+++ b/scripts/b2g_build.py
@@ -225,33 +225,16 @@ class B2GBuild(LocalesMixin, MockMixin, 
 
         if self.buildbot_config is None:
             self.info("Reading buildbot build properties...")
             self.read_buildbot_config()
 
         if 'target' not in self.config:
             self.fatal("Must specify --target!")
 
-        # Override target for things with weird names
-        if self.config['target'] == 'mako':
-            self.info("Using target nexus-4 instead of mako")
-            self.config['target'] = 'nexus-4'
-            if self.config.get('b2g_config_dir') is None:
-                self.config['b2g_config_dir'] = 'mako'
-        elif self.config['target'] == 'generic':
-            if self.config.get('b2g_config_dir') == 'emulator':
-                self.info("Using target emulator instead of generic")
-                self.config['target'] = 'emulator'
-            elif self.config.get('b2g_config_dir') == 'emulator-jb':
-                self.info("Using target emulator-jb instead of generic")
-                self.config['target'] = 'emulator-jb'
-            elif self.config.get('b2g_config_dir') == 'emulator-kk':
-                self.info("Using target emulator-kk instead of generic")
-                self.config['target'] = 'emulator-kk'
-
         if not (self.buildbot_config and 'properties' in self.buildbot_config) and 'repo' not in self.config:
             self.fatal("Must specify --repo")
 
     def query_abs_dirs(self):
         if self.abs_dirs:
             return self.abs_dirs
         abs_dirs = LocalesMixin.query_abs_dirs(self)