summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoozbeh Pournader <roozbeh@google.com>2017-05-31 16:42:54 -0700
committerRoozbeh Pournader <roozbeh@google.com>2017-05-31 16:42:54 -0700
commita49bcc0972b3772872e36ca06817e950e26593bf (patch)
tree9d15af4d5f306140df945b80d3894e300c6801d5
parente1b86aec9b8967997de7212980c0dff7ed83b738 (diff)
Add Roboto Condensed Medium fonts to the build
Also add symlinks for Roboto Condensed Light in MINIMAL_FONT_FOOTPRINT builds which we had forgotten before. Bug: 62201012 Test: make -j checkbuild Change-Id: I0c109fd008954f92a643d158b38f703758884ad6
-rw-r--r--Android.mk8
-rw-r--r--fonts.mk4
2 files changed, 10 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index cd859ad..8094048 100644
--- a/Android.mk
+++ b/Android.mk
@@ -65,6 +65,10 @@ $(eval $(call create-font-symlink,RobotoCondensed-Regular.ttf,Roboto-Regular.ttf
$(eval $(call create-font-symlink,RobotoCondensed-Bold.ttf,Roboto-Bold.ttf))
$(eval $(call create-font-symlink,RobotoCondensed-Italic.ttf,Roboto-Italic.ttf))
$(eval $(call create-font-symlink,RobotoCondensed-BoldItalic.ttf,Roboto-BoldItalic.ttf))
+$(eval $(call create-font-symlink,RobotoCondensed-Light.ttf,Roboto-Regular.ttf))
+$(eval $(call create-font-symlink,RobotoCondensed-LightItalic.ttf,Roboto-Italic.ttf))
+$(eval $(call create-font-symlink,RobotoCondensed-Medium.ttf,Roboto-Regular.ttf))
+$(eval $(call create-font-symlink,RobotoCondensed-MediumItalic.ttf,Roboto-Italic.ttf))
else # !MINIMAL_FONT
font_src_files += \
@@ -81,7 +85,9 @@ font_src_files += \
RobotoCondensed-Italic.ttf \
RobotoCondensed-BoldItalic.ttf \
RobotoCondensed-Light.ttf \
- RobotoCondensed-LightItalic.ttf
+ RobotoCondensed-LightItalic.ttf \
+ RobotoCondensed-Medium.ttf \
+ RobotoCondensed-MediumItalic.ttf
endif # !MINIMAL_FONT
diff --git a/fonts.mk b/fonts.mk
index a344cee..2ba713e 100644
--- a/fonts.mk
+++ b/fonts.mk
@@ -30,4 +30,6 @@ PRODUCT_PACKAGES := \
RobotoCondensed-Italic.ttf \
RobotoCondensed-BoldItalic.ttf \
RobotoCondensed-Light.ttf \
- RobotoCondensed-LightItalic.ttf
+ RobotoCondensed-LightItalic.ttf \
+ RobotoCondensed-Medium.ttf \
+ RobotoCondensed-MediumItalic.ttf