Bug 1563311 - Remove the --enable-webrender ac_options. r=froydnj

This drops the MOZ_BUILD_WEBRENDER and MOZ_ENABLE_WEBRENDER flags
which are unused after the preceding two patches.

Depends on D36820

Differential Revision: https://phabricator.services.mozilla.com/D36821

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Kartikaya Gupta 2019-07-03 20:53:54 +00:00
Родитель ea187ce3df
Коммит 7db86f8d91
1 изменённых файлов: 3 добавлений и 41 удалений

Просмотреть файл

@ -698,52 +698,14 @@ id_and_secret_keyfile('Leanplum SDK')
simple_keyfile('Pocket API')
# WebRender integration
# WebRender Debugger integration
# ==============================================================
option('--enable-webrender', nargs='?', choices=('build',),
help='Include WebRender in the build and/or enable it at runtime')
@depends('--enable-webrender')
def webrender(value):
build_webrender = None
enable_webrender = None
if value.origin == 'default':
# if nothing is specified, default to building
build_webrender = True
elif len(value) and value[0] == 'build':
# if explicitly set to 'build', then we build but don't enable
build_webrender = True
elif bool(value):
# if set to true, then build and enable
build_webrender = True
enable_webrender = True
# in all other cases, don't build it or enable it (defaults are fine)
return namespace(
build = build_webrender,
enable = enable_webrender,
)
option('--enable-webrender-debugger',
help='Build the websocket debug server in WebRender')
@depends(webrender, '--enable-webrender-debugger')
def webrender_debugger(webrender, debugger):
if debugger.origin == 'default':
# Not trying to build the debuger
return None
if not webrender.build and debugger:
die('Cannot build WR debugger without also building webrender')
if debugger:
return True
return None
set_config('MOZ_BUILD_WEBRENDER', webrender.build)
set_define('MOZ_BUILD_WEBRENDER', webrender.build)
set_config('MOZ_ENABLE_WEBRENDER', webrender.enable)
set_config('MOZ_WEBRENDER_DEBUGGER', webrender_debugger)
set_config('MOZ_WEBRENDER_DEBUGGER',
depends_if('--enable-webrender-debugger')(lambda _: True))
# SIMD acceleration for Rust code (currently just encoding_rs)
# ==============================================================