diff options
Diffstat (limited to 'toolkit')
-rw-r--r-- | toolkit/moz.configure | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/toolkit/moz.configure b/toolkit/moz.configure index deb7129d8..48af779f7 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -349,11 +349,13 @@ add_old_configure_assignment('MOZ_FMP4', fmp4) option(name='--enable-chrome-format', help='Select FORMAT of chrome files during packaging.', nargs=1, - choices=('omni', 'jar', 'flat'), + choices=('optimized', '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) @@ -368,12 +370,21 @@ def jar_maker_format(host, build_project): set_config('MOZ_JAR_MAKER_FILE_FORMAT', jar_maker_format) -@depends(toolkit) -def omnijar_name(toolkit): +@depends('--enable-chrome-format', toolkit) +def omnijar_name(value, toolkit): + if value[0] == 'optimized': + return '$(DLL_PREFIX)core$(DLL_SUFFIX)' 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', |