diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-11-20 09:47:03 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-11-20 09:47:03 +0000 |
| commit | 5165ed02285315cc0bed7977c7bac6d0a90ca43c (patch) | |
| tree | 9b761a21eb924915e51c2d803208e6c01b505a45 /toolkit/moz.configure | |
| parent | e1db27e19989db11fef70f439cf95821316535b3 (diff) | |
| parent | ca9abcdf1702c37bf00048dab3f460b2252873a3 (diff) | |
| download | UXP-RELBASE_20201120.tar UXP-RELBASE_20201120.tar.gz UXP-RELBASE_20201120.tar.lz UXP-RELBASE_20201120.tar.xz UXP-RELBASE_20201120.zip | |
Merge branch 'redwood' into releaseRELBASE_20201124RELBASE_20201120RC_20201120
Diffstat (limited to 'toolkit/moz.configure')
| -rw-r--r-- | toolkit/moz.configure | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/toolkit/moz.configure b/toolkit/moz.configure index 863327751..8d399be67 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -345,36 +345,6 @@ set_config('MOZ_FMP4', fmp4) set_define('MOZ_FMP4', fmp4) add_old_configure_assignment('MOZ_FMP4', fmp4) -# Miscellaneous -# ============================================================== -option(name='--enable-chrome-format', - help='Select FORMAT of chrome files during packaging.', - nargs=1, - choices=('omni', 'jar', 'flat'), - default='omni') - -@depends('--enable-chrome-format') -def packager_format(value): - return value[0] - -set_config('MOZ_PACKAGER_FORMAT', packager_format) - -@depends(host, build_project) -def jar_maker_format(host, build_project): - # Multilocales for mobile/android use the same mergedirs for all locales, - # so we can't use symlinks for those builds. - if host.os == 'WINNT': - return 'flat' - return 'symlink' - -set_config('MOZ_JAR_MAKER_FILE_FORMAT', jar_maker_format) - -@depends(toolkit) -def omnijar_name(toolkit): - return 'omni.ja' - -set_config('OMNIJAR_NAME', omnijar_name) - # Permissions system # ============================================================== option(name='--disable-permissions', |