From 5a5f1429dec06ee392c194d2a4250b9455a2cf94 Mon Sep 17 00:00:00 2001 From: Roozbeh Pournader Date: Wed, 25 Feb 2015 14:52:35 -0800 Subject: Remove Roboto fonts and their build rules They are now moved to external/roboto-fonts. Symlinks from deprecated fonts to Roboto for compatibility reasons are still created here. Change-Id: I9e1b88a4289d055ea187e241d6514f0b37c5ee1b --- data/fonts/Android.mk | 38 ----------------------------- data/fonts/Roboto-Black.ttf | Bin 242172 -> 0 bytes data/fonts/Roboto-BlackItalic.ttf | Bin 263976 -> 0 bytes data/fonts/Roboto-Bold.ttf | Bin 242304 -> 0 bytes data/fonts/Roboto-BoldItalic.ttf | Bin 264068 -> 0 bytes data/fonts/Roboto-Italic.ttf | Bin 263056 -> 0 bytes data/fonts/Roboto-Light.ttf | Bin 243788 -> 0 bytes data/fonts/Roboto-LightItalic.ttf | Bin 266080 -> 0 bytes data/fonts/Roboto-Medium.ttf | Bin 241640 -> 0 bytes data/fonts/Roboto-MediumItalic.ttf | Bin 263548 -> 0 bytes data/fonts/Roboto-Regular.ttf | Bin 241008 -> 0 bytes data/fonts/Roboto-Thin.ttf | Bin 246428 -> 0 bytes data/fonts/Roboto-ThinItalic.ttf | Bin 267068 -> 0 bytes data/fonts/RobotoCondensed-Bold.ttf | Bin 239596 -> 0 bytes data/fonts/RobotoCondensed-BoldItalic.ttf | Bin 261660 -> 0 bytes data/fonts/RobotoCondensed-Italic.ttf | Bin 261992 -> 0 bytes data/fonts/RobotoCondensed-Light.ttf | Bin 240820 -> 0 bytes data/fonts/RobotoCondensed-LightItalic.ttf | Bin 264500 -> 0 bytes data/fonts/RobotoCondensed-Regular.ttf | Bin 238804 -> 0 bytes data/fonts/fonts.mk | 18 -------------- 20 files changed, 56 deletions(-) delete mode 100644 data/fonts/Roboto-Black.ttf delete mode 100644 data/fonts/Roboto-BlackItalic.ttf delete mode 100644 data/fonts/Roboto-Bold.ttf delete mode 100644 data/fonts/Roboto-BoldItalic.ttf delete mode 100644 data/fonts/Roboto-Italic.ttf delete mode 100644 data/fonts/Roboto-Light.ttf delete mode 100644 data/fonts/Roboto-LightItalic.ttf delete mode 100644 data/fonts/Roboto-Medium.ttf delete mode 100644 data/fonts/Roboto-MediumItalic.ttf delete mode 100644 data/fonts/Roboto-Regular.ttf delete mode 100644 data/fonts/Roboto-Thin.ttf delete mode 100644 data/fonts/Roboto-ThinItalic.ttf delete mode 100644 data/fonts/RobotoCondensed-Bold.ttf delete mode 100644 data/fonts/RobotoCondensed-BoldItalic.ttf delete mode 100644 data/fonts/RobotoCondensed-Italic.ttf delete mode 100644 data/fonts/RobotoCondensed-Light.ttf delete mode 100644 data/fonts/RobotoCondensed-LightItalic.ttf delete mode 100644 data/fonts/RobotoCondensed-Regular.ttf (limited to 'data') diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk index 80fb1fd..38321a3 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 79b5f74..0000000 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 4c58b7b..0000000 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 58397cc..0000000 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 606252c..0000000 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 cc3fd40..0000000 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 e65c2d2..0000000 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 d5476e7..0000000 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 9263090..0000000 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 329aab9..0000000 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 c515eca..0000000 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 35ab525..0000000 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 edada2e..0000000 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 bcbeece..0000000 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 7680d0a..0000000 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 04c83a0..0000000 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 9f57418..0000000 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 f9eac04..0000000 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 3a06286..0000000 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 f285ebe..a5939fa 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 \ -- cgit v1.1