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

Commit 4e061d89 authored by Kohsuke Yatoh's avatar Kohsuke Yatoh Committed by Android (Google) Code Review
Browse files

Merge "Use fake NotoSerif fonts in test."

parents 62e18d74 5045660b

tests/UpdatableSystemFontTest/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ android_test { 
        "vts",

    ],

    data: [

        ":NotoSerif-Regular.ttf",

        ":NotoSerif-Bold.ttf",

        ":UpdatableSystemFontTestCertDer",

        ":UpdatableSystemFontTest_NotoColorEmoji.ttf",

        ":UpdatableSystemFontTest_NotoColorEmoji.sig",
@@ -48,7 +46,9 @@ android_test { 
        ":UpdatableSystemFontTest_NotoColorEmojiVPlus1.sig",

        ":UpdatableSystemFontTest_NotoColorEmojiVPlus2.ttf",

        ":UpdatableSystemFontTest_NotoColorEmojiVPlus2.sig",

        ":UpdatableSystemFontTest_NotoSerif-Regular.ttf",

        ":UpdatableSystemFontTest_NotoSerif-Regular.sig",

        ":UpdatableSystemFontTest_NotoSerif-Bold.ttf",

        ":UpdatableSystemFontTest_NotoSerif-Bold.sig",

    ],

    sdk_version: "test_current",

tests/UpdatableSystemFontTest/AndroidTest.xml

+5 −5
Original line number Diff line number Diff line
@@ -28,11 +28,7 @@ 
    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">

        <option name="cleanup" value="true" />

        <option name="push" value="UpdatableSystemFontTestCert.der->/data/local/tmp/UpdatableSystemFontTestCert.der" />

        <option name="push" value="NotoColorEmoji.ttf->/data/local/tmp/NotoColorEmoji.ttf" />

        <option name="push" value="NotoSerif-Regular.ttf->/data/local/tmp/NotoSerif-Regular.ttf" />

        <option name="push" value="NotoSerif-Bold.ttf->/data/local/tmp/NotoSerif-Bold.ttf" />

        <option name="push" value="UpdatableSystemFontTest_NotoSerif-Regular.sig->/data/local/tmp/UpdatableSystemFontTest_NotoSerif-Regular.sig" />

        <option name="push" value="UpdatableSystemFontTest_NotoSerif-Bold.sig->/data/local/tmp/UpdatableSystemFontTest_NotoSerif-Bold.sig" />

        <option name="push" value="UpdatableSystemFontTest_NotoColorEmoji.ttf->/data/local/tmp/UpdatableSystemFontTest_NotoColorEmoji.ttf" />

        <option name="push" value="UpdatableSystemFontTest_NotoColorEmoji.sig->/data/local/tmp/UpdatableSystemFontTest_NotoColorEmoji.sig" />

        <option name="push" value="UpdatableSystemFontTest_NotoColorEmojiV0.ttf->/data/local/tmp/UpdatableSystemFontTest_NotoColorEmojiV0.ttf" />

        <option name="push" value="UpdatableSystemFontTest_NotoColorEmojiV0.sig->/data/local/tmp/UpdatableSystemFontTest_NotoColorEmojiV0.sig" />
@@ -40,6 +36,10 @@ 
        <option name="push" value="UpdatableSystemFontTest_NotoColorEmojiVPlus1.sig->/data/local/tmp/UpdatableSystemFontTest_NotoColorEmojiVPlus1.sig" />

        <option name="push" value="UpdatableSystemFontTest_NotoColorEmojiVPlus2.ttf->/data/local/tmp/UpdatableSystemFontTest_NotoColorEmojiVPlus2.ttf" />

        <option name="push" value="UpdatableSystemFontTest_NotoColorEmojiVPlus2.sig->/data/local/tmp/UpdatableSystemFontTest_NotoColorEmojiVPlus2.sig" />

        <option name="push" value="UpdatableSystemFontTest_NotoSerif-Regular.ttf->/data/local/tmp/UpdatableSystemFontTest_NotoSerif-Regular.ttf" />

        <option name="push" value="UpdatableSystemFontTest_NotoSerif-Regular.sig->/data/local/tmp/UpdatableSystemFontTest_NotoSerif-Regular.sig" />

        <option name="push" value="UpdatableSystemFontTest_NotoSerif-Bold.sig->/data/local/tmp/UpdatableSystemFontTest_NotoSerif-Bold.sig" />

        <option name="push" value="UpdatableSystemFontTest_NotoSerif-Bold.ttf->/data/local/tmp/UpdatableSystemFontTest_NotoSerif-Bold.ttf" />

    </target_preparer>



    <test class="com.android.tradefed.testtype.AndroidJUnitTest">

tests/UpdatableSystemFontTest/src/com/android/updatablesystemfont/UpdatableSystemFontTest.java

+3 −3
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ public class UpdatableSystemFontTest { 


    private static final String NOTO_COLOR_EMOJI_POSTSCRIPT_NAME = "NotoColorEmoji";

    private static final String NOTO_COLOR_EMOJI_TTF =

            "/data/local/tmp/NotoColorEmoji.ttf";

            "/data/local/tmp/UpdatableSystemFontTest_NotoColorEmoji.ttf";

    private static final String NOTO_COLOR_EMOJI_SIG =

            "/data/local/tmp/UpdatableSystemFontTest_NotoColorEmoji.sig";

    // A font with revision == 0.
@@ -105,13 +105,13 @@ public class UpdatableSystemFontTest { 


    private static final String NOTO_SERIF_REGULAR_POSTSCRIPT_NAME = "NotoSerif";

    private static final String NOTO_SERIF_REGULAR_TTF =

            "/data/local/tmp/NotoSerif-Regular.ttf";

            "/data/local/tmp/UpdatableSystemFontTest_NotoSerif-Regular.ttf";

    private static final String NOTO_SERIF_REGULAR_SIG =

            "/data/local/tmp/UpdatableSystemFontTest_NotoSerif-Regular.sig";



    private static final String NOTO_SERIF_BOLD_POSTSCRIPT_NAME = "NotoSerif-Bold";

    private static final String NOTO_SERIF_BOLD_TTF =

            "/data/local/tmp/NotoSerif-Bold.ttf";

            "/data/local/tmp/UpdatableSystemFontTest_NotoSerif-Bold.ttf";

    private static final String NOTO_SERIF_BOLD_SIG =

            "/data/local/tmp/UpdatableSystemFontTest_NotoSerif-Bold.sig";

tests/UpdatableSystemFontTest/testdata/Android.bp

+13 −9
Original line number Diff line number Diff line
@@ -21,11 +21,19 @@ package { 
    default_applicable_licenses: ["frameworks_base_license"],

}



// An existing module name is reused to avoid merge conflicts.

// TODO: fix the font file name.

filegroup {

    name: "UpdatableSystemFontTest_NotoColorEmoji.ttf",

    srcs: ["NotoColorEmoji.ttf"],

    srcs: ["UpdatableSystemFontTest_NotoColorEmoji.ttf"],

}



filegroup {

    name: "UpdatableSystemFontTest_NotoSerif-Regular.ttf",

    srcs: ["UpdatableSystemFontTest_NotoSerif-Regular.ttf"],

}



filegroup {

    name: "UpdatableSystemFontTest_NotoSerif-Bold.ttf",

    srcs: ["UpdatableSystemFontTest_NotoSerif-Bold.ttf"],

}



filegroup {
@@ -43,10 +51,6 @@ filegroup { 
    srcs: ["UpdatableSystemFontTestCert.der"],

}



genrule_defaults {

    name: "updatable_system_font_increment_font_revision_default",

}



genrule {

    name: "UpdatableSystemFontTest_NotoColorEmojiV0.ttf",

    srcs: [":UpdatableSystemFontTest_NotoColorEmoji.ttf"],
@@ -124,13 +128,13 @@ genrule { 
genrule {

    name: "UpdatableSystemFontTest_NotoSerif-Regular.sig",

    defaults: ["updatable_system_font_sig_gen_default"],

    srcs: [":NotoSerif-Regular.ttf"],

    srcs: ["UpdatableSystemFontTest_NotoSerif-Regular.ttf"],

    out: ["UpdatableSystemFontTest_NotoSerif-Regular.sig"],

}



genrule {

    name: "UpdatableSystemFontTest_NotoSerif-Bold.sig",

    defaults: ["updatable_system_font_sig_gen_default"],

    srcs: [":NotoSerif-Bold.ttf"],

    srcs: ["UpdatableSystemFontTest_NotoSerif-Bold.ttf"],

    out: ["UpdatableSystemFontTest_NotoSerif-Bold.sig"],

}