From 8aa9355535820bb4b3d47d52b8ece367724d9faa Mon Sep 17 00:00:00 2001 From: Moonchild Date: Sun, 15 Nov 2020 12:49:30 +0000 Subject: Revert "[toolkit] Add optimized UI code format option" This reverts commit 511ac54cab15741ba399ff62ac45bab1f26f0582. --- toolkit/moz.configure | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/toolkit/moz.configure b/toolkit/moz.configure index 48af779f7..deb7129d8 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -349,13 +349,11 @@ add_old_configure_assignment('MOZ_FMP4', fmp4) option(name='--enable-chrome-format', help='Select FORMAT of chrome files during packaging.', nargs=1, - choices=('optimized', 'omni', 'jar', 'flat'), + choices=('omni', 'jar', 'flat'), default='omni') @depends('--enable-chrome-format') def packager_format(value): - if value[0] == 'optimized': - return 'omni' return value[0] set_config('MOZ_PACKAGER_FORMAT', packager_format) @@ -370,21 +368,12 @@ def jar_maker_format(host, build_project): set_config('MOZ_JAR_MAKER_FILE_FORMAT', jar_maker_format) -@depends('--enable-chrome-format', toolkit) -def omnijar_name(value, toolkit): - if value[0] == 'optimized': - return '$(DLL_PREFIX)core$(DLL_SUFFIX)' +@depends(toolkit) +def omnijar_name(toolkit): return 'omni.ja' set_config('OMNIJAR_NAME', omnijar_name) -@depends('--enable-chrome-format') -def compression_format(value): - if value[0] == 'optimized': - return 'brotli' - -set_config('JAR_COMPRESSION', compression_format) - # Permissions system # ============================================================== option(name='--disable-permissions', -- cgit v1.2.3