summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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)",