diff options
| author | Moonchild <moonchild@palemoon.org> | 2022-01-23 13:50:15 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2022-04-08 15:04:57 +0200 |
| commit | c683df54833bece7840543ca3cc4a93c2c98573f (patch) | |
| tree | cf6080ac499cd9d8c37b090931762207d87c6195 | |
| parent | 8862a2ebf7a4759ba454dbd89c96eacf9ba368d0 (diff) | |
| download | uxp-c683df54833bece7840543ca3cc4a93c2c98573f.tar.gz | |
No issue - Always build MAR support.
Even when there is no updater.
| -rw-r--r-- | config/external/moz.build | 5 | ||||
| -rw-r--r-- | toolkit/toolkit.mozbuild | 9 |
2 files changed, 5 insertions, 9 deletions
diff --git a/config/external/moz.build b/config/external/moz.build index 89378dafd1..dc094b6af1 100644 --- a/config/external/moz.build +++ b/config/external/moz.build @@ -10,9 +10,8 @@ DIRS += ['lgpllibs'] if not CONFIG['MOZ_SYSTEM_JPEG']: external_dirs += ['media/libjpeg'] -if CONFIG['MOZ_UPDATER']: - if not CONFIG['MOZ_SYSTEM_BZ2']: - external_dirs += ['modules/libbz2'] +if not CONFIG['MOZ_SYSTEM_BZ2']: + external_dirs += ['modules/libbz2'] # There's no "native" brotli or woff2 yet, but probably in the future... external_dirs += ['modules/brotli'] diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild index a768bdc4b4..b8f30d64a9 100644 --- a/toolkit/toolkit.mozbuild +++ b/toolkit/toolkit.mozbuild @@ -17,9 +17,9 @@ DIRS += [ '/security/apps', ] -# the signing related bits of libmar depend on nss -if CONFIG['MOZ_UPDATER']: - DIRS += ['/modules/libmar'] +# MAR support at all times. +DIRS += ['/modules/libmar', + '/other-licenses/bsdiff'] DIRS += [ '/config/external/freetype2', @@ -32,9 +32,6 @@ DIRS += [ if CONFIG['MOZ_AUTH_EXTENSION']: DIRS += ['/extensions/auth'] -if CONFIG['MOZ_UPDATER']: - DIRS += ['/other-licenses/bsdiff'] - # Gecko/Core components. DIRS += [ |