summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-08-27 06:17:31 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-08-27 06:17:31 +0000
commit0aa26c91f42b197cc7980e337cfd87d7d62d9082 (patch)
tree156d5cda848f267bb3e6b95b73dc63e2bf186a8a
parent5506e4c46dc5bf3ffa01a3da181c5b677993ffec (diff)
parentc561a8e0f88fd44c29e211b1115f46314636a674 (diff)
downloadnoto-fonts-android12-mainline-extservices-release.tar.gz
Change-Id: I6386f8c4982360be48d389c215c57b6a201b52bc
-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)",