diff options
| author | Jeremy Andrews <athenian200@outlook.com> | 2021-09-30 17:46:39 -0500 |
|---|---|---|
| committer | Jeremy Andrews <athenian200@outlook.com> | 2021-09-30 17:46:39 -0500 |
| commit | 87d9dd1d7acb74aa6ab3d6f67a6fe53ad2ece664 (patch) | |
| tree | b621fec28f50d349d42ee5180d35c18169aaaba2 /toolkit | |
| parent | 95829005dcc05f81c15b59ea93d63c9868b6db39 (diff) | |
| download | aura-central-87d9dd1d7acb74aa6ab3d6f67a6fe53ad2ece664.tar.gz | |
No Issue - Always build with bundled fonts
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/content/license.html | 4 | ||||
| -rw-r--r-- | toolkit/fonts/moz.build | 3 | ||||
| -rw-r--r-- | toolkit/moz.build | 4 |
3 files changed, 2 insertions, 9 deletions
diff --git a/toolkit/content/license.html b/toolkit/content/license.html index 65b4b1542..1e535f3da 100644 --- a/toolkit/content/license.html +++ b/toolkit/content/license.html @@ -88,9 +88,7 @@ <li><a href="about:license#dagre-d3">Dagre-D3 License</a></li> #endif <li><a href="about:license#dtoa">dtoa License</a></li> -#if defined(XP_WIN) || defined(XP_LINUX) <li><a href="about:license#twemoji">Twemoji License</a></li> -#endif <li><a href="about:license#expat">Expat License</a></li> <li><a href="about:license#firebug">Firebug License</a></li> <li><a href="about:license#gfx-font-list">gfxFontList License</a></li> @@ -2824,7 +2822,6 @@ OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE. <hr> -#if defined(XP_WIN) || defined(XP_LINUX) <h1><a id="twemoji"></a>Twemoji License</h1> <p>This license applies to the emoji art contained within the bundled @@ -2867,7 +2864,6 @@ publicity, privacy, or moral rights may limit how you use the material. <hr> -#endif <h1><a id="expat"></a>Expat License</h1> diff --git a/toolkit/fonts/moz.build b/toolkit/fonts/moz.build index a2a37879d..129a7737c 100644 --- a/toolkit/fonts/moz.build +++ b/toolkit/fonts/moz.build @@ -3,5 +3,4 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -if CONFIG['OS_ARCH'] in ('WINNT', 'Linux'): - FINAL_TARGET_FILES.fonts += ['TwemojiMozilla.ttf'] +FINAL_TARGET_FILES.fonts += ['TwemojiMozilla.ttf'] diff --git a/toolkit/moz.build b/toolkit/moz.build index 9bf579bb2..3d0083540 100644 --- a/toolkit/moz.build +++ b/toolkit/moz.build @@ -6,6 +6,7 @@ DIRS += [ 'components', 'content', + 'fonts', 'forgetaboutsite', 'locales', 'modules', @@ -17,9 +18,6 @@ DIRS += [ 'themes', ] -if CONFIG['MOZ_BUNDLED_FONTS']: - DIRS += ['fonts'] - if CONFIG['MOZ_JETPACK']: DIRS += ['jetpack'] |