Bug 1357326 - Remove things relying on the b2g* MOZ_BUILD_APP in the build system. r=gps

--HG--
extra : rebase_source : 2471f47ad07d8b90098f90db3ead2e26648cea9f
This commit is contained in:
Mike Hommey 2017-04-18 18:39:53 +09:00
parent fc81db2822
commit 75fd170e4c
6 changed files with 1 additions and 38 deletions

View File

@ -20,7 +20,7 @@ DIRS += [
# /browser uses DIST_SUBDIR. We opt-in to this treatment when building
# DevTools for the browser to keep the root omni.ja slim for use by external XUL
# apps. Mulet also uses this since it includes /browser.
if CONFIG['MOZ_BUILD_APP'] in ('browser', 'b2g/dev'):
if CONFIG['MOZ_BUILD_APP'] == 'browser':
DIST_SUBDIR = 'browser'
export('DIST_SUBDIR')

View File

@ -423,7 +423,6 @@ ARCHIVE_FILES = {
'node-http2/**',
'node-spdy/**',
'remotexpcshelltests.py',
'runtestsb2g.py',
'runxpcshelltests.py',
'xpcshellcommandline.py',
],

View File

@ -734,13 +734,6 @@ class MachCommandConditions(object):
return cls.substs.get('MOZ_BUILD_APP') == 'browser'
return False
@staticmethod
def is_mulet(cls):
"""Must have a Mulet build."""
if hasattr(cls, 'substs'):
return cls.substs.get('MOZ_BUILD_APP') == 'b2g/dev'
return False
@staticmethod
def is_b2g(cls):
"""Must have a B2G build."""
@ -748,23 +741,6 @@ class MachCommandConditions(object):
return cls.substs.get('MOZ_WIDGET_TOOLKIT') == 'gonk'
return False
@staticmethod
def is_b2g_desktop(cls):
"""Must have a B2G desktop build."""
if hasattr(cls, 'substs'):
return cls.substs.get('MOZ_BUILD_APP') == 'b2g' and \
cls.substs.get('MOZ_WIDGET_TOOLKIT') != 'gonk'
return False
@staticmethod
def is_emulator(cls):
"""Must have a B2G build with an emulator configured."""
try:
return MachCommandConditions.is_b2g(cls) and \
cls.device_name.startswith('emulator')
except AttributeError:
return False
@staticmethod
def is_android(cls):
"""Must have an Android build."""

View File

@ -112,14 +112,6 @@ def build_dict(config, env=os.environ):
return p
if d['buildapp'] == 'b2g':
if d['toolkit'] == 'gonk':
return 'emulator'
if d['bits'] == 64:
return 'linux64_gecko'
return 'linux32_gecko'
if d['buildapp'] == 'mobile/android':
if d['processor'] == 'x86':
return 'android-x86'

View File

@ -27,9 +27,6 @@ class LintMeta(type):
return test
for project in (
'b2g',
'b2g/dev',
'b2g/graphene',
'browser',
'embedding/ios',
'extensions',

View File

@ -1,4 +1,3 @@
[DEFAULT]
skip-if = buildapp == 'b2g'
[test_chrome.js]