summaryrefslogtreecommitdiff
path: root/toolkit/moz.configure
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-11-16 12:47:54 -0500
committerMatt A. Tobin <email@mattatobin.com>2020-11-16 12:47:54 -0500
commitecb827c5c4782934453054b0b94a27169a65f3d6 (patch)
tree02eae29dacba506765cdf5469a2030d95cb18b0a /toolkit/moz.configure
parent6bc5748b00efcd5a30b5736a2f89ef21c9362869 (diff)
downloaduxp-ecb827c5c4782934453054b0b94a27169a65f3d6.tar.gz
Issue #251 - Move chrome packaging options to ac configure
Also adds options for new functionality in #1683
Diffstat (limited to 'toolkit/moz.configure')
-rw-r--r--toolkit/moz.configure30
1 files changed, 0 insertions, 30 deletions
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index deb7129d87..fbd728fdc8 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -344,36 +344,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',