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

Commit 024f141d authored by Seigo Nonaka's avatar Seigo Nonaka
Browse files

Remove RELEASE_PACKAGE_VARIABLE_NOTO_SANS_CJK dependency 

Bug: 364533012
Test: m
Flag: EXEMPT removing RELEASE_PACKAGE_VARIABLE_NOTO_SANS_CJK
Change-Id: I7bc1ba843d71e33c52540daefdcb1d925902313e
parent 3b204907

data/fonts/Android.bp

+1 −14
Original line number Diff line number Diff line
@@ -53,22 +53,9 @@ soong_config_bool_variable { 
    name: "use_var_font",

}



soong_config_module_type {

    name: "prebuilt_fonts_xml",

    module_type: "prebuilt_etc",

    config_namespace: "noto_sans_cjk_config",

    bool_variables: ["use_var_font"],

    properties: ["src"],

}



prebuilt_fonts_xml {

prebuilt_etc {

    name: "fonts.xml",

    src: "fonts.xml",

    soong_config_variables: {

        use_var_font: {

            src: "fonts_cjkvf.xml",

        },

    },

}



prebuilt_etc {

data/fonts/font_fallback.xml

deleted100644 → 0
+0 −950

File deleted.

Preview size limit exceeded, changes collapsed.

data/fonts/font_fallback_cjkvf.xml

deleted100644 → 0
+0 −966

File deleted.

Preview size limit exceeded, changes collapsed.

data/fonts/fonts.xml

+136 −4
Original line number Diff line number Diff line
@@ -1409,24 +1409,123 @@ 
        <font weight="400" style="normal">NotoSansSymbols-Regular-Subsetted.ttf</font>

    </family>

    <family lang="zh-Hans">

        <font weight="400" style="normal" index="2" postScriptName="NotoSansCJKjp-Regular">

        <font weight="100" style="normal" index="2" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="100"/>

        </font>

        <font weight="200" style="normal" index="2" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="200"/>

        </font>

        <font weight="300" style="normal" index="2" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="300"/>

        </font>

        <font weight="400" style="normal" index="2" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="400"/>

        </font>

        <font weight="500" style="normal" index="2" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="500"/>

        </font>

        <font weight="600" style="normal" index="2" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="600"/>

        </font>

        <font weight="700" style="normal" index="2" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="700"/>

        </font>

        <font weight="800" style="normal" index="2" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="800"/>

        </font>

        <font weight="900" style="normal" index="2" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="900"/>

        </font>

        <font weight="400" style="normal" index="2" fallbackFor="serif"

              postScriptName="NotoSerifCJKjp-Regular">NotoSerifCJK-Regular.ttc

        </font>

    </family>

    <family lang="zh-Hant,zh-Bopo">

        <font weight="400" style="normal" index="3" postScriptName="NotoSansCJKjp-Regular">

        <font weight="100" style="normal" index="3" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="100"/>

        </font>

        <font weight="200" style="normal" index="3" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="200"/>

        </font>

        <font weight="300" style="normal" index="3" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="300"/>

        </font>

        <font weight="400" style="normal" index="3" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="400"/>

        </font>

        <font weight="500" style="normal" index="3" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="500"/>

        </font>

        <font weight="600" style="normal" index="3" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="600"/>

        </font>

        <font weight="700" style="normal" index="3" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="700"/>

        </font>

        <font weight="800" style="normal" index="3" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="800"/>

        </font>

        <font weight="900" style="normal" index="3" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="900"/>

        </font>

        <font weight="400" style="normal" index="3" fallbackFor="serif"

              postScriptName="NotoSerifCJKjp-Regular">NotoSerifCJK-Regular.ttc

        </font>

    </family>

    <family lang="ja">

        <font weight="400" style="normal" index="0" postScriptName="NotoSansCJKjp-Regular">

        <font weight="100" style="normal" index="0" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="100"/>

        </font>

        <font weight="200" style="normal" index="0" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="200"/>

        </font>

        <font weight="300" style="normal" index="0" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="300"/>

        </font>

        <font weight="400" style="normal" index="0" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="400"/>

        </font>

        <font weight="500" style="normal" index="0" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="500"/>

        </font>

        <font weight="600" style="normal" index="0" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="600"/>

        </font>

        <font weight="700" style="normal" index="0" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="700"/>

        </font>

        <font weight="800" style="normal" index="0" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="800"/>

        </font>

        <font weight="900" style="normal" index="0" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="900"/>

        </font>

        <font weight="400" style="normal" index="0" fallbackFor="serif"

              postScriptName="NotoSerifCJKjp-Regular">NotoSerifCJK-Regular.ttc
@@ -1443,8 +1542,41 @@ 
        </font>

    </family>

    <family lang="ko">

        <font weight="400" style="normal" index="1" postScriptName="NotoSansCJKjp-Regular">

        <font weight="100" style="normal" index="1" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="100"/>

        </font>

        <font weight="200" style="normal" index="1" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="200"/>

        </font>

        <font weight="300" style="normal" index="1" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="300"/>

        </font>

        <font weight="400" style="normal" index="1" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="400"/>

        </font>

        <font weight="500" style="normal" index="1" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="500"/>

        </font>

        <font weight="600" style="normal" index="1" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="600"/>

        </font>

        <font weight="700" style="normal" index="1" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="700"/>

        </font>

        <font weight="800" style="normal" index="1" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="800"/>

        </font>

        <font weight="900" style="normal" index="1" postScriptName="NotoSansCJKJP-Regular">

            NotoSansCJK-Regular.ttc

            <axis tag="wght" stylevalue="900"/>

        </font>

        <font weight="400" style="normal" index="1" fallbackFor="serif"

              postScriptName="NotoSerifCJKjp-Regular">NotoSerifCJK-Regular.ttc

data/fonts/fonts_cjkvf.xml

deleted100644 → 0
+0 −1795

File deleted.

Preview size limit exceeded, changes collapsed.