commit 5b1bac7a16d06f4865a6fcd4ab969b9428d08549
author Kohsuke Yatoh <kyatoh@google.com> Thu Jul 22 18:54:46 2021 +0000
committer Kohsuke Yatoh <kyatoh@google.com> Thu Jul 22 18:58:15 2021 +0000
tree 6b2941497be588fe72de11df5d16612e2f2cc17a
parent e84b0763df6263e9465dce45652431e0c31090e0

Rename NotoColorEmojiTtf module.

Bug: 191914223
Test: atest UpdatableSystemFontTest
Change-Id: Ic79290beb5d8d24d8835a808de90cb820d774003

tests/UpdatableSystemFontTest/Android.bp

diff --git a/tests/UpdatableSystemFontTest/Android.bp b/tests/UpdatableSystemFontTest/Android.bp
index dc090aa..c59a41e 100644
--- a/tests/UpdatableSystemFontTest/Android.bp
+++ b/tests/UpdatableSystemFontTest/Android.bp
@@ -37,10 +37,10 @@
         "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

diff --git a/tests/UpdatableSystemFontTest/testdata/Android.bp b/tests/UpdatableSystemFontTest/testdata/Android.bp
index 5eba336..64b698d 100644
--- a/tests/UpdatableSystemFontTest/testdata/Android.bp
+++ b/tests/UpdatableSystemFontTest/testdata/Android.bp
@@ -22,9 +22,9 @@
 }
 
 // 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 {
     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 {
     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 {
     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 {
     name: "UpdatableSystemFontTest_NotoColorEmoji.sig",
     defaults: ["updatable_system_font_sig_gen_default"],
-    srcs: [":NotoColorEmoji.ttf"],
+    srcs: [":UpdatableSystemFontTest_NotoColorEmoji.ttf"],
     out: ["UpdatableSystemFontTest_NotoColorEmoji.sig"],
 }