From 9d8c7e82424ae2a8256157e288deb37d51509f13 Mon Sep 17 00:00:00 2001 From: Russell Brenner Date: Fri, 23 Sep 2011 14:57:32 -0700 Subject: Replaced Lohit_Hindi with Lohit-Devanagari Lohit-Devanagari is now provided by external/lohit-fonts, replacing Lohit_Hindi from here. Removed font from fonts.mk and renamed in fallback_fonts.xml. Bug: 5364436 Change-Id: I0b8f65dbfdbec1802fba526209d7f88d2cf64fc4 --- CleanSpec.mk | 1 + data/fonts/Lohit_Hindi.ttf | Bin 67960 -> 0 bytes data/fonts/fallback_fonts.xml | 2 +- data/fonts/fonts.mk | 1 - 4 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 data/fonts/Lohit_Hindi.ttf diff --git a/CleanSpec.mk b/CleanSpec.mk index d48904c30fdc..7bab94519e61 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -111,6 +111,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/wifi/java) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/wifi/java) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/fonts/Lohit_Hindi.ttf) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/data/fonts/Lohit_Hindi.ttf b/data/fonts/Lohit_Hindi.ttf deleted file mode 100644 index 73caae34aac0..000000000000 Binary files a/data/fonts/Lohit_Hindi.ttf and /dev/null differ diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml index e4685589f834..881233a1eb5a 100644 --- a/data/fonts/fallback_fonts.xml +++ b/data/fonts/fallback_fonts.xml @@ -56,7 +56,7 @@ - Lohit_Hindi.ttf + Lohit-Devanagari.ttf diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk index 5bac8f00e479..67d04c914745 100644 --- a/data/fonts/fonts.mk +++ b/data/fonts/fonts.mk @@ -30,7 +30,6 @@ PRODUCT_COPY_FILES := \ frameworks/base/data/fonts/DroidSerif-Italic.ttf:system/fonts/DroidSerif-Italic.ttf \ frameworks/base/data/fonts/DroidSerif-BoldItalic.ttf:system/fonts/DroidSerif-BoldItalic.ttf \ frameworks/base/data/fonts/DroidSansMono.ttf:system/fonts/DroidSansMono.ttf \ - frameworks/base/data/fonts/Lohit_Hindi.ttf:system/fonts/Lohit_Hindi.ttf \ frameworks/base/data/fonts/DroidSansArmenian.ttf:system/fonts/DroidSansArmenian.ttf \ frameworks/base/data/fonts/DroidSansGeorgian.ttf:system/fonts/DroidSansGeorgian.ttf \ frameworks/base/data/fonts/Clockopia.ttf:system/fonts/Clockopia.ttf \ -- cgit v1.2.3-59-g8ed1b