Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit 8e85059

Browse files
committed
bug 831354 - Ship [but don't actually use] fonts (Open Sans and Charis SIL Compact) for content in Firefox for Android. r=mfinkle,blassey
1 parent cb36801 commit 8e85059

12 files changed

Lines changed: 33 additions & 1 deletion

mobile/android/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ VPATH = @srcdir@
99

1010
include $(DEPTH)/config/autoconf.mk
1111

12-
DIRS = ../locales locales base chrome components modules themes/core app
12+
DIRS = ../locales locales base chrome components modules themes/core app fonts
1313

1414
ifndef LIBXUL_SDK
1515
PARALLEL_DIRS += $(DEPTH)/xulrunner/tools/redit
1.6 MB
Binary file not shown.
1.59 MB
Binary file not shown.
1.61 MB
Binary file not shown.
1.64 MB
Binary file not shown.

mobile/android/fonts/Makefile.in

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# This Source Code Form is subject to the terms of the Mozilla Public
2+
# License, v. 2.0. If a copy of the MPL was not distributed with this
3+
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
4+
5+
DEPTH = @DEPTH@
6+
topsrcdir = @top_srcdir@
7+
srcdir = @srcdir@
8+
VPATH = @srcdir@
9+
10+
include $(DEPTH)/config/autoconf.mk
11+
12+
packaged_fonts = \
13+
CharisSILCompact-R.ttf \
14+
CharisSILCompact-B.ttf \
15+
CharisSILCompact-I.ttf \
16+
CharisSILCompact-BI.ttf \
17+
OpenSans-Regular.ttf \
18+
OpenSans-Bold.ttf \
19+
OpenSans-Light.ttf \
20+
OpenSans-Italic.ttf \
21+
OpenSans-BoldItalic.ttf \
22+
OpenSans-LightItalic.ttf \
23+
$(NULL)
24+
25+
GARBAGE += $(packaged_fonts)
26+
27+
include $(topsrcdir)/config/rules.mk
28+
include $(topsrcdir)/testing/testsuite-targets.mk
29+
30+
libs:: $(packaged_fonts)
31+
$(INSTALL) $^ $(DIST)/bin/res/fonts/
32+
219 KB
Binary file not shown.
208 KB
Binary file not shown.
208 KB
Binary file not shown.
217 KB
Binary file not shown.

0 commit comments

Comments
 (0)