summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKohsuke Yatoh <kyatoh@google.com>2021-07-03 01:50:54 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-07-03 01:50:54 +0000
commit749d38a0cd96c48a7d536d6145f26cc00b46f57b (patch)
tree8a4fe2feb9a985e7976cdc5a7573e1247059735d
parent8bfad9aa1d3c7816fa53c4d6bbcd315b830cabb4 (diff)
parent91f9785ec68c47e5d44da35c7d6cf03c3214463e (diff)
downloadnoto-fonts-749d38a0cd96c48a7d536d6145f26cc00b46f57b.tar.gz
Remove NotoColorEmojiTtf module. am: b7c656cd5e am: 91f9785ec6
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/noto-fonts/+/15114195 Change-Id: I9cfe143e4f0874e0830c79be8c1e7cb066f0e4e0
-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)",