summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKohsuke Yatoh <kyatoh@google.com>2021-06-25 21:53:13 +0000
committerKohsuke Yatoh <kyatoh@google.com>2021-06-30 16:11:13 +0000
commitb7c656cd5efb8ec12c3fd55d4819ac3212d22166 (patch)
tree156d5cda848f267bb3e6b95b73dc63e2bf186a8a
parent10609ea31f757bd0d11f6204fba323042c71a09c (diff)
downloadnoto-fonts-android12-qpr1-d-s2-release.tar.gz
Bug: 191914223 Test: atest UpdatableSystemFontTest Change-Id: If66358c34715fbb8200fc276ebd21de237d624c0
-rw-r--r--emoji-compat/Android.bp4
1 files changed, 3 insertions, 1 deletions
diff --git a/emoji-compat/Android.bp b/emoji-compat/Android.bp
index cf33d75..d43e880 100644
--- a/emoji-compat/Android.bp
+++ b/emoji-compat/Android.bp
@@ -60,8 +60,10 @@ prebuilt_font {
}
// To use in other build rules.
+// Renamed instead of removed to avoid merge conflicts.
+// TODO: remove this.
genrule {
- name: "NotoColorEmojiTtf",
+ name: "Unused_NotoColorEmojiTtf",
srcs: ["font/NotoColorEmojiCompat.ttf"],
out: ["NotoColorEmoji.ttf"],
cmd: "cp $(in) $(out)",