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

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

Merge "Rename NotoColorEmojiTtf module."

parents 3e6b07ac 5b1bac7a

tests/UpdatableSystemFontTest/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -37,10 +37,10 @@ android_test { 
        "vts",

    ],

    data: [

        ":NotoColorEmoji.ttf",

        ":NotoSerif-Regular.ttf",

        ":NotoSerif-Bold.ttf",

        ":UpdatableSystemFontTestCertDer",

        ":UpdatableSystemFontTest_NotoColorEmoji.ttf",

        ":UpdatableSystemFontTest_NotoColorEmoji.sig",

        ":UpdatableSystemFontTest_NotoColorEmojiV0.ttf",

        ":UpdatableSystemFontTest_NotoColorEmojiV0.sig",

tests/UpdatableSystemFontTest/testdata/Android.bp

+6 −6
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ package { 
}



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

// TODO: fix the font and module name.

// TODO: fix the font file name.

filegroup {

    name: "NotoColorEmojiTtf",

    name: "UpdatableSystemFontTest_NotoColorEmoji.ttf",

    srcs: ["NotoColorEmoji.ttf"],

}
@@ -49,7 +49,7 @@ genrule_defaults { 


genrule {

    name: "UpdatableSystemFontTest_NotoColorEmojiV0.ttf",

    srcs: [":NotoColorEmoji.ttf"],

    srcs: [":UpdatableSystemFontTest_NotoColorEmoji.ttf"],

    out: ["UpdatableSystemFontTest_NotoColorEmojiV0.ttf"],

    tools: ["update_font_metadata"],

    cmd: "$(location update_font_metadata) " +
@@ -60,7 +60,7 @@ genrule { 


genrule {

    name: "UpdatableSystemFontTest_NotoColorEmojiVPlus1.ttf",

    srcs: [":NotoColorEmoji.ttf"],

    srcs: [":UpdatableSystemFontTest_NotoColorEmoji.ttf"],

    out: ["UpdatableSystemFontTest_NotoColorEmojiVPlus1.ttf"],

    tools: ["update_font_metadata"],

    cmd: "$(location update_font_metadata) " +
@@ -71,7 +71,7 @@ genrule { 


genrule {

    name: "UpdatableSystemFontTest_NotoColorEmojiVPlus2.ttf",

    srcs: [":NotoColorEmoji.ttf"],

    srcs: [":UpdatableSystemFontTest_NotoColorEmoji.ttf"],

    out: ["UpdatableSystemFontTest_NotoColorEmojiVPlus2.ttf"],

    tools: ["update_font_metadata"],

    cmd: "$(location update_font_metadata) " +
@@ -96,7 +96,7 @@ genrule_defaults { 
genrule {

    name: "UpdatableSystemFontTest_NotoColorEmoji.sig",

    defaults: ["updatable_system_font_sig_gen_default"],

    srcs: [":NotoColorEmoji.ttf"],

    srcs: [":UpdatableSystemFontTest_NotoColorEmoji.ttf"],

    out: ["UpdatableSystemFontTest_NotoColorEmoji.sig"],

}