diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk index 80fb1fdd3a8ab..38321a3d89d10 100644 --- a/data/fonts/Android.mk +++ b/data/fonts/Android.mk @@ -111,49 +111,11 @@ $(eval include $(BUILD_PREBUILT)) endef font_src_files := \ - Roboto-Regular.ttf \ - Roboto-Bold.ttf \ - Roboto-Italic.ttf \ - Roboto-BoldItalic.ttf \ Clockopia.ttf \ AndroidClock.ttf \ AndroidClock_Highlight.ttf \ AndroidClock_Solid.ttf -ifeq ($(MINIMAL_FONT_FOOTPRINT),true) - -$(eval $(call create-font-symlink,Roboto-Black.ttf,Roboto-Bold.ttf)) -$(eval $(call create-font-symlink,Roboto-BlackItalic.ttf,Roboto-BoldItalic.ttf)) -$(eval $(call create-font-symlink,Roboto-Light.ttf,Roboto-Regular.ttf)) -$(eval $(call create-font-symlink,Roboto-LightItalic.ttf,Roboto-Italic.ttf)) -$(eval $(call create-font-symlink,Roboto-Medium.ttf,Roboto-Regular.ttf)) -$(eval $(call create-font-symlink,Roboto-MediumItalic.ttf,Roboto-Italic.ttf)) -$(eval $(call create-font-symlink,Roboto-Thin.ttf,Roboto-Regular.ttf)) -$(eval $(call create-font-symlink,Roboto-ThinItalic.ttf,Roboto-Italic.ttf)) -$(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)) - -else # !MINIMAL_FONT -font_src_files += \ - Roboto-Black.ttf \ - Roboto-BlackItalic.ttf \ - Roboto-Light.ttf \ - Roboto-LightItalic.ttf \ - Roboto-Medium.ttf \ - Roboto-MediumItalic.ttf \ - Roboto-Thin.ttf \ - Roboto-ThinItalic.ttf \ - RobotoCondensed-Regular.ttf \ - RobotoCondensed-Bold.ttf \ - RobotoCondensed-Italic.ttf \ - RobotoCondensed-BoldItalic.ttf \ - RobotoCondensed-Light.ttf \ - RobotoCondensed-LightItalic.ttf - -endif # !MINIMAL_FONT - $(foreach f, $(font_src_files), $(call build-one-font-module, $(f))) build-one-font-module := diff --git a/data/fonts/Roboto-Black.ttf b/data/fonts/Roboto-Black.ttf deleted file mode 100644 index 79b5f74bb8bcc..0000000000000 Binary files a/data/fonts/Roboto-Black.ttf and /dev/null differ diff --git a/data/fonts/Roboto-BlackItalic.ttf b/data/fonts/Roboto-BlackItalic.ttf deleted file mode 100644 index 4c58b7bb141b4..0000000000000 Binary files a/data/fonts/Roboto-BlackItalic.ttf and /dev/null differ diff --git a/data/fonts/Roboto-Bold.ttf b/data/fonts/Roboto-Bold.ttf deleted file mode 100644 index 58397ccf522d6..0000000000000 Binary files a/data/fonts/Roboto-Bold.ttf and /dev/null differ diff --git a/data/fonts/Roboto-BoldItalic.ttf b/data/fonts/Roboto-BoldItalic.ttf deleted file mode 100644 index 606252c699247..0000000000000 Binary files a/data/fonts/Roboto-BoldItalic.ttf and /dev/null differ diff --git a/data/fonts/Roboto-Italic.ttf b/data/fonts/Roboto-Italic.ttf deleted file mode 100644 index cc3fd40ea9c2b..0000000000000 Binary files a/data/fonts/Roboto-Italic.ttf and /dev/null differ diff --git a/data/fonts/Roboto-Light.ttf b/data/fonts/Roboto-Light.ttf deleted file mode 100644 index e65c2d2311520..0000000000000 Binary files a/data/fonts/Roboto-Light.ttf and /dev/null differ diff --git a/data/fonts/Roboto-LightItalic.ttf b/data/fonts/Roboto-LightItalic.ttf deleted file mode 100644 index d5476e7502a65..0000000000000 Binary files a/data/fonts/Roboto-LightItalic.ttf and /dev/null differ diff --git a/data/fonts/Roboto-Medium.ttf b/data/fonts/Roboto-Medium.ttf deleted file mode 100644 index 9263090f10791..0000000000000 Binary files a/data/fonts/Roboto-Medium.ttf and /dev/null differ diff --git a/data/fonts/Roboto-MediumItalic.ttf b/data/fonts/Roboto-MediumItalic.ttf deleted file mode 100644 index 329aab9f2b009..0000000000000 Binary files a/data/fonts/Roboto-MediumItalic.ttf and /dev/null differ diff --git a/data/fonts/Roboto-Regular.ttf b/data/fonts/Roboto-Regular.ttf deleted file mode 100644 index c515eca73bcfc..0000000000000 Binary files a/data/fonts/Roboto-Regular.ttf and /dev/null differ diff --git a/data/fonts/Roboto-Thin.ttf b/data/fonts/Roboto-Thin.ttf deleted file mode 100644 index 35ab5255983e0..0000000000000 Binary files a/data/fonts/Roboto-Thin.ttf and /dev/null differ diff --git a/data/fonts/Roboto-ThinItalic.ttf b/data/fonts/Roboto-ThinItalic.ttf deleted file mode 100644 index edada2ee0a3a8..0000000000000 Binary files a/data/fonts/Roboto-ThinItalic.ttf and /dev/null differ diff --git a/data/fonts/RobotoCondensed-Bold.ttf b/data/fonts/RobotoCondensed-Bold.ttf deleted file mode 100644 index bcbeecee523ca..0000000000000 Binary files a/data/fonts/RobotoCondensed-Bold.ttf and /dev/null differ diff --git a/data/fonts/RobotoCondensed-BoldItalic.ttf b/data/fonts/RobotoCondensed-BoldItalic.ttf deleted file mode 100644 index 7680d0a68b84d..0000000000000 Binary files a/data/fonts/RobotoCondensed-BoldItalic.ttf and /dev/null differ diff --git a/data/fonts/RobotoCondensed-Italic.ttf b/data/fonts/RobotoCondensed-Italic.ttf deleted file mode 100644 index 04c83a080c07d..0000000000000 Binary files a/data/fonts/RobotoCondensed-Italic.ttf and /dev/null differ diff --git a/data/fonts/RobotoCondensed-Light.ttf b/data/fonts/RobotoCondensed-Light.ttf deleted file mode 100644 index 9f57418f57de8..0000000000000 Binary files a/data/fonts/RobotoCondensed-Light.ttf and /dev/null differ diff --git a/data/fonts/RobotoCondensed-LightItalic.ttf b/data/fonts/RobotoCondensed-LightItalic.ttf deleted file mode 100644 index f9eac04971de1..0000000000000 Binary files a/data/fonts/RobotoCondensed-LightItalic.ttf and /dev/null differ diff --git a/data/fonts/RobotoCondensed-Regular.ttf b/data/fonts/RobotoCondensed-Regular.ttf deleted file mode 100644 index 3a062869cfd4a..0000000000000 Binary files a/data/fonts/RobotoCondensed-Regular.ttf and /dev/null differ diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk index f285ebed9d6ea..a5939fa607f4d 100644 --- a/data/fonts/fonts.mk +++ b/data/fonts/fonts.mk @@ -21,24 +21,6 @@ PRODUCT_COPY_FILES := \ PRODUCT_PACKAGES := \ DroidSansFallback.ttf \ - Roboto-Regular.ttf \ - Roboto-Bold.ttf \ - Roboto-Italic.ttf \ - Roboto-BoldItalic.ttf \ - Roboto-Black.ttf \ - Roboto-BlackItalic.ttf \ - Roboto-Light.ttf \ - Roboto-LightItalic.ttf \ - Roboto-Medium.ttf \ - Roboto-MediumItalic.ttf \ - Roboto-Thin.ttf \ - Roboto-ThinItalic.ttf \ - RobotoCondensed-Regular.ttf \ - RobotoCondensed-Bold.ttf \ - RobotoCondensed-Italic.ttf \ - RobotoCondensed-BoldItalic.ttf \ - RobotoCondensed-Light.ttf \ - RobotoCondensed-LightItalic.ttf \ DroidSansMono.ttf \ Clockopia.ttf \ AndroidClock.ttf \