Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5133f1c8 authored by Victoria Lease's avatar Victoria Lease Committed by Android (Google) Code Review
Browse files

Merge "use Noto Sans CJK fonts for EXTENDED_FONT_FOOTPRINT builds"

parents bc6d1403 f99c12ce

data/fonts/Android.mk

+13 −7
Original line number Diff line number Diff line
@@ -42,12 +42,21 @@ $(eval $(call create-font-symlink,DroidSerif-Bold.ttf,NotoSerif-Bold.ttf)) 
$(eval $(call create-font-symlink,DroidSerif-Italic.ttf,NotoSerif-Italic.ttf))

$(eval $(call create-font-symlink,DroidSerif-BoldItalic.ttf,NotoSerif-BoldItalic.ttf))



extra_font_files := \

    DroidSans.ttf \

    DroidSans-Bold.ttf



################################

# On space-constrained devices, we include a subset of fonts:

ifeq ($(SMALLER_FONT_FOOTPRINT),true)



droidsans_fallback_src := DroidSansFallback.ttf

extra_font_files := DroidSans.ttf DroidSans-Bold.ttf

else



else  # !SMALLER_FONT_FOOTPRINT



droidsans_fallback_src := DroidSansFallbackFull.ttf



ifneq ($(EXTENDED_FONT_FOOTPRINT),true)

include $(CLEAR_VARS)

LOCAL_MODULE := MTLmr3m.ttf

LOCAL_SRC_FILES := $(LOCAL_MODULE)
@@ -55,12 +64,9 @@ LOCAL_MODULE_CLASS := ETC 
LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts

include $(BUILD_PREBUILT)

extra_font_files += MTLmr3m.ttf

endif  # !EXTENDED_FONT_FOOTPRINT



droidsans_fallback_src := DroidSansFallbackFull.ttf

extra_font_files := \

	DroidSans.ttf \

	DroidSans-Bold.ttf \

	MTLmr3m.ttf

endif  # SMALLER_FONT_FOOTPRINT



################################

data/fonts/fallback_fonts.xml

+20 −0
Original line number Diff line number Diff line
@@ -217,6 +217,26 @@ 
            <file variant="compact">NotoSansMyanmarUI-Bold.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file lang="zh-CN">NotoSansHans-Regular.otf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file lang="zh-TW">NotoSansHant-Regular.otf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file lang="ja">NotoSansJP-Regular.otf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file lang="ko">NotoSansKR-Regular.otf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file>NanumGothic.ttf</file>