Merge "DroidSans -> NotoSans for {Devanagari,Tamil,Thai}" into klp-dev (e0e4197c) · Commits · e / os / android_frameworks_base

data/fonts/Android.mk

+0 −20

Original line number	Diff line number	Diff line
		@@ -52,22 +52,6 @@ LOCAL_MODULE_TAGS := optional
		LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts
		include $(BUILD_PREBUILT)

		include $(CLEAR_VARS)
		LOCAL_MODULE := DroidSansTamil-Regular.ttf
		LOCAL_SRC_FILES := $(LOCAL_MODULE)
		LOCAL_MODULE_CLASS := ETC
		LOCAL_MODULE_TAGS := optional
		LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts
		include $(BUILD_PREBUILT)

		include $(CLEAR_VARS)
		LOCAL_MODULE := DroidSansTamil-Bold.ttf
		LOCAL_SRC_FILES := $(LOCAL_MODULE)
		LOCAL_MODULE_CLASS := ETC
		LOCAL_MODULE_TAGS := optional
		LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts
		include $(BUILD_PREBUILT)

		include $(CLEAR_VARS)
		LOCAL_MODULE := MTLmr3m.ttf
		LOCAL_SRC_FILES := $(LOCAL_MODULE)
		@@ -81,8 +65,6 @@ extra_font_files := \
		DroidSans.ttf \
		DroidSans-Bold.ttf \
		DroidSansEthiopic-Regular.ttf \
		DroidSansTamil-Regular.ttf \
		DroidSansTamil-Bold.ttf \
		MTLmr3m.ttf
		endif # SMALLER_FONT_FOOTPRINT

		@@ -153,10 +135,8 @@ font_src_files += \
		RobotoCondensed-BoldItalic.ttf \
		DroidNaskh-Regular.ttf \
		DroidNaskhUI-Regular.ttf \
		DroidSansDevanagari-Regular.ttf \
		DroidSansHebrew-Regular.ttf \
		DroidSansHebrew-Bold.ttf \
		DroidSansThai.ttf \
		DroidSansArmenian.ttf \
		DroidSansGeorgian.ttf \
		AndroidEmoji.ttf