зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1490575 - Remove MOZ_MULET checks from build files. r=froydnj
Mulet was a Firefox OS simulator that is no longer supported: https://wiki.mozilla.org/Mulet Differential Revision: https://phabricator.services.mozilla.com/D5734 --HG-- extra : rebase_source : 5d6c8563fe7f5b3bafa9a17d1057eb3a3db6e241 extra : source : f7c8de6bc4a978421f49e43b951188597086874b
This commit is contained in:
Родитель
9aeeb8fc28
Коммит
da01f965e0
|
@ -16,11 +16,7 @@ DEFINES += -DPKG_LOCALE_MANIFEST=$(topobjdir)/browser/installer/locale-manifest.
|
|||
MOZ_CHROME_LOCALE_ENTRIES=@RESPATH@/browser/chrome/ @RESPATH@/chrome/
|
||||
|
||||
# Some files have been already bundled with xulrunner
|
||||
ifndef MOZ_MULET
|
||||
MOZ_PKG_FATAL_WARNINGS = 1
|
||||
else
|
||||
DEFINES += -DMOZ_MULET
|
||||
endif
|
||||
|
||||
# When packaging an artifact build not all xpt files expected by the
|
||||
# packager will be present.
|
||||
|
|
|
@ -2040,13 +2040,8 @@ if test -n "$MOZ_GRAPHENE"; then
|
|||
AC_DEFINE(MOZ_GRAPHENE)
|
||||
fi
|
||||
|
||||
if test -n "$MOZ_MULET"; then
|
||||
AC_DEFINE(MOZ_MULET)
|
||||
fi
|
||||
|
||||
AC_SUBST(MOZ_PHOENIX)
|
||||
AC_SUBST(MOZ_XULRUNNER)
|
||||
AC_SUBST(MOZ_MULET)
|
||||
|
||||
dnl ========================================================
|
||||
dnl Ensure Android SDK and build-tools versions depending on
|
||||
|
|
|
@ -52,9 +52,7 @@ def build_dict(config, env=os.environ):
|
|||
d["appname"] = substs["MOZ_APP_NAME"]
|
||||
|
||||
# Build app name
|
||||
if 'MOZ_MULET' in substs and substs.get('MOZ_MULET') == "1":
|
||||
d["buildapp"] = "mulet"
|
||||
elif 'MOZ_BUILD_APP' in substs:
|
||||
if 'MOZ_BUILD_APP' in substs:
|
||||
d["buildapp"] = substs["MOZ_BUILD_APP"]
|
||||
|
||||
# processor
|
||||
|
@ -100,7 +98,7 @@ def build_dict(config, env=os.environ):
|
|||
d['cc_type'] = substs.get('CC_TYPE')
|
||||
|
||||
def guess_platform():
|
||||
if d['buildapp'] in ('browser', 'mulet'):
|
||||
if d['buildapp'] == 'browser':
|
||||
p = d['os']
|
||||
if p == 'mac':
|
||||
p = 'macosx64'
|
||||
|
@ -109,9 +107,6 @@ def build_dict(config, env=os.environ):
|
|||
elif p in ('win',):
|
||||
p = '{}32'.format(p)
|
||||
|
||||
if d['buildapp'] == 'mulet':
|
||||
p = '{}-mulet'.format(p)
|
||||
|
||||
if d['asan']:
|
||||
p = '{}-asan'.format(p)
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче