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

Commit 671e581e authored by Seigo Nonaka's avatar Seigo Nonaka Committed by Android (Google) Code Review
Browse files

Merge "Use NotoSansCJK-Regular.ttc instead of separated font files."

parents 2fa27915 c73b2257

data/fonts/Android.mk

+0 −23
Original line number Diff line number Diff line
@@ -17,11 +17,6 @@ 


LOCAL_PATH := $(call my-dir)



# Use full Noto Sans Japanese font on non-smaller footprints

ifneq ($(SMALLER_FONT_FOOTPRINT),true)

FONT_NOTOSANS_JP_FULL := true

endif



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

# create symlink for given font

# $(1): new font $(2): link target
@@ -51,24 +46,6 @@ extra_font_files := \ 
    DroidSans.ttf \

    DroidSans-Bold.ttf



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

# Do not include Motoya on space-constrained devices

ifneq ($(SMALLER_FONT_FOOTPRINT),true)

# Do not include Motoya if we are including Noto Sans Japanese

ifneq ($(FONT_NOTOSANS_JP_FULL),true)



include $(CLEAR_VARS)

LOCAL_MODULE := MTLmr3m.ttf

LOCAL_SRC_FILES := $(LOCAL_MODULE)

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts

include $(BUILD_PREBUILT)

extra_font_files += MTLmr3m.ttf



endif  # !FONT_NOTOSANS_JP_FULL

endif  # !SMALLER_FONT_FOOTPRINT



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

# Use DroidSansMono to hang extra_font_files on

include $(CLEAR_VARS)

data/fonts/fonts.xml

+4 −7
Original line number Diff line number Diff line
@@ -330,16 +330,16 @@ 
        <font weight="400" style="normal">NotoSansSymbols-Regular-Subsetted.ttf</font>

    </family>

    <family lang="zh-Hans">

        <font weight="400" style="normal">NotoSansSC-Regular.otf</font>

        <font weight="400" style="normal" ttcIndex="2">NotoSansCJK-Regular.ttc</font>

    </family>

    <family lang="zh-Hant">

        <font weight="400" style="normal">NotoSansTC-Regular.otf</font>

        <font weight="400" style="normal" ttcIndex="3">NotoSansCJK-Regular.ttc</font>

    </family>

    <family lang="ja">

        <font weight="400" style="normal">NotoSansJP-Regular.otf</font>

        <font weight="400" style="normal" ttcIndex="0">NotoSansCJK-Regular.ttc</font>

    </family>

    <family lang="ko">

        <font weight="400" style="normal">NotoSansKR-Regular.otf</font>

        <font weight="400" style="normal" ttcIndex="1">NotoSansCJK-Regular.ttc</font>

    </family>

    <family>

        <font weight="400" style="normal">NanumGothic.ttf</font>
@@ -350,9 +350,6 @@ 
    <family>

        <font weight="400" style="normal">DroidSansFallback.ttf</font>

    </family>

    <family lang="ja">

        <font weight="400" style="normal">MTLmr3m.ttf</font>

    </family>

    <!--

        Tai Le and Mongolian are intentionally kept last, to make sure they don't override

        the East Asian punctuation for Chinese.