summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKohsuke Yatoh <kyatoh@google.com>2021-07-03 01:45:39 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-07-03 01:45:39 +0000
commit91f9785ec68c47e5d44da35c7d6cf03c3214463e (patch)
tree156d5cda848f267bb3e6b95b73dc63e2bf186a8a
parente1f754dcd9e8ea1521ae35090e5be681934ee336 (diff)
parentb7c656cd5efb8ec12c3fd55d4819ac3212d22166 (diff)
Remove NotoColorEmojiTtf module. am: b7c656cd5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/noto-fonts/+/15114195 Change-Id: I26fb9610fae397987283dafc3b3656d2c5716ef9
-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)",