Merge 07e66dd084836df528a933dcfe2dd164e7c98764 on remote branch

Change-Id: I27f4f328951b9e1a472a3a46ed7c9707cfed2839

5 files changed, 9 insertions, 8 deletions

diff --git a/METADATA b/METADATA
index 3814b8d..e545f4c 100644
--- a/METADATA
+++ b/METADATA
@@ -2,5 +2,6 @@
 #     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
 #     DEPENDING ON IT IN YOUR PROJECT. ***
 third_party {
+  license_note: "contains OFL fonts"
   license_type: BY_EXCEPTION_ONLY
 }
diff --git a/emoji-compat/Android.bp b/emoji-compat/Android.bp
index 987216d..afc0bfc 100644
--- a/emoji-compat/Android.bp
+++ b/emoji-compat/Android.bp
@@ -59,14 +59,9 @@ prebuilt_font {
     src: "font/NotoColorEmojiFlags.ttf",
 }
 
-// To use in other build rules.
-// Renamed instead of removed to avoid merge conflicts.
-// TODO: remove this.
-genrule {
-    name: "Unused_NotoColorEmojiTtf",
-    srcs: ["font/NotoColorEmojiCompat.ttf"],
-    out: ["NotoColorEmoji.ttf"],
-    cmd: "cp $(in) $(out)",
+prebuilt_font {
+    name: "NotoColorEmojiLegacy.ttf",
+    src: "font/NotoColorEmojiCompatLegacy.ttf",
 }
 
 android_test {
diff --git a/emoji-compat/font/NotoColorEmojiCompatLegacy.ttf b/emoji-compat/font/NotoColorEmojiCompatLegacy.ttf
new file mode 100644
index 0000000..0565a84
--- /dev/null
+++ b/emoji-compat/font/NotoColorEmojiCompatLegacy.ttf
diff --git a/fonts.mk b/fonts.mk
index 67d4e30..286c5aa 100644
--- a/fonts.mk
+++ b/fonts.mk
@@ -16,7 +16,12 @@
 # PRODUCT_COPY_FILES to install the font files, so that the NOTICE file can
 # get installed too.
 
+ifneq ($(CLOCKWORK_PRODUCT),true)
+	PRODUCT_PACKAGES := NotoColorEmojiLegacy.ttf
+endif
+
 PRODUCT_PACKAGES := \
+    $(PRODUCT_PACKAGES) \
     NotoColorEmoji.ttf \
     NotoColorEmojiFlags.ttf \
     NotoNaskhArabic-Bold.ttf \
diff --git a/other/NotoSansTamilUI-VF.ttf b/other/NotoSansTamilUI-VF.ttf
index e97c942..12edbd5 100644
--- a/other/NotoSansTamilUI-VF.ttf
+++ b/other/NotoSansTamilUI-VF.ttf