summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeigo Nonaka <nona@google.com>2021-05-03 14:09:03 -0700
committerSeigo Nonaka <nona@google.com>2021-05-07 00:20:57 -0700
commitdf41aae3a1b011242a8429fb8ada49dbc3f817e9 (patch)
tree6a44d4b8b2fefec44d76070c7efb58bbfb1f9442
parenta3f5044f4c2bad32e168c91712eafc3016d0466b (diff)
downloadnoto-fonts-df41aae3a1b011242a8429fb8ada49dbc3f817e9.tar.gz
Unify emoji font files used in Android
Now NotoColorEmoji.ttf can be used for EmojiComapt library. Bug: 186700756 Test: TreeHugger Test: atest UpdatableSystemFontTest Change-Id: I23bb6a7bc40bb9e27159ed2312b413f183cc17b7
-rw-r--r--emoji-compat/Android.bp (renamed from emoji/Android.bp)13
-rw-r--r--emoji/MODULE_LICENSE_OFL0
-rw-r--r--emoji/NOTICE92
-rw-r--r--emoji/NotoColorEmoji.ttfbin10082864 -> 0 bytes
-rw-r--r--emoji/README.android8
5 files changed, 8 insertions, 105 deletions
diff --git a/emoji/Android.bp b/emoji-compat/Android.bp
index 028387f..c6b71ee 100644
--- a/emoji/Android.bp
+++ b/emoji-compat/Android.bp
@@ -37,24 +37,27 @@ license {
name: "external_noto-fonts_emoji_license",
visibility: [":__subpackages__"],
license_kinds: [
- "SPDX-license-identifier-MIT",
+ "SPDX-license-identifier-Unicode-DFS",
"SPDX-license-identifier-OFL", // by exception only
],
license_text: [
- "NOTICE",
+ "LICENSE_OFL",
+ "LICENSE_UNICODE",
],
}
prebuilt_font {
name: "NotoColorEmoji.ttf",
- src: "NotoColorEmoji.ttf",
+ src: "font/NotoColorEmojiCompat.ttf",
dist: {
targets: ["droidcore"],
},
}
// To use in other build rules.
-filegroup {
+genrule {
name: "NotoColorEmojiTtf",
- srcs: ["NotoColorEmoji.ttf"],
+ srcs: ["font/NotoColorEmojiCompat.ttf"],
+ out: ["NotoColorEmoji.ttf"],
+ cmd: "cp $(in) $(out)",
}
diff --git a/emoji/MODULE_LICENSE_OFL b/emoji/MODULE_LICENSE_OFL
deleted file mode 100644
index e69de29..0000000
--- a/emoji/MODULE_LICENSE_OFL
+++ /dev/null
diff --git a/emoji/NOTICE b/emoji/NOTICE
deleted file mode 100644
index d952d62..0000000
--- a/emoji/NOTICE
+++ /dev/null
@@ -1,92 +0,0 @@
-This Font Software is licensed under the SIL Open Font License,
-Version 1.1.
-
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font
-creation efforts of academic and linguistic communities, and to
-provide a free and open framework in which fonts may be shared and
-improved in partnership with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply to
-any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software
-components as distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to,
-deleting, or substituting -- in part or in whole -- any of the
-components of the Original Version, by changing formats or by porting
-the Font Software to a new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed,
-modify, redistribute, and sell modified and unmodified copies of the
-Font Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components, in
-Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the
-corresponding Copyright Holder. This restriction only applies to the
-primary font name as presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created using
-the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/emoji/NotoColorEmoji.ttf b/emoji/NotoColorEmoji.ttf
deleted file mode 100644
index 98fadf4..0000000
--- a/emoji/NotoColorEmoji.ttf
+++ /dev/null
Binary files differ
diff --git a/emoji/README.android b/emoji/README.android
deleted file mode 100644
index 62abd6c..0000000
--- a/emoji/README.android
+++ /dev/null
@@ -1,8 +0,0 @@
-URL: https://github.com/googlei18n/noto-emoji
-Version: 2.007
-License: OFL 1.1
-License File: NOTICE
-
-Description:
-Noto Color Emoji font.
-