diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-03 23:06:13 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-03 23:06:13 +0000 |
commit | 948e146e7d1082f9cc67c9b05bbac5479f692c85 (patch) | |
tree | 156d5cda848f267bb3e6b95b73dc63e2bf186a8a | |
parent | f5aae962c3ed6a67859745a35933fa289ab831cd (diff) | |
parent | 91f9785ec68c47e5d44da35c7d6cf03c3214463e (diff) |
Snap for 7521319 from 91f9785ec68c47e5d44da35c7d6cf03c3214463e to sc-v2-release
Change-Id: I7bd2b39779f6ad0c643469e8ac24fb53688871c7
-rw-r--r-- | emoji-compat/Android.bp | 4 |
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)", |