Update NotoColorEmoji to 2.028 am: 10609ea31f
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/noto-fonts/+/15114894
Change-Id: I962828906a0ee37f4c6e9089658b98a0ce1debae
diff --git a/Android.bp b/Android.bp
index bdf31cb..c72e703 100644
--- a/Android.bp
+++ b/Android.bp
@@ -17,33 +17,10 @@
// CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
// DEPENDING ON IT IN YOUR PROJECT. ***
package {
- default_applicable_licenses: ["external_noto-fonts_license"],
-}
-
-// Added automatically by a large-scale-change that took the approach of
-// 'apply every license found to every target'. While this makes sure we respect
-// every license restriction, it may not be entirely correct.
-//
-// e.g. GPL in an MIT project might only apply to the contrib/ directory.
-//
-// Please consider splitting the single license below into multiple licenses,
-// taking care not to lose any license_kind information, and overriding the
-// default license using the 'licenses: [...]' property on targets as needed.
-//
-// For unused files, consider creating a 'fileGroup' with "//visibility:private"
-// to attach the license to, and including a comment whether the files may be
-// used in the current project.
-// See: http://go/android-license-faq
-license {
- name: "external_noto-fonts_license",
- visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-MIT",
- "SPDX-license-identifier-OFL", // by exception only
- "SPDX-license-identifier-Unicode-DFS",
+ default_applicable_licenses: [
+ "external_noto-fonts_cjk_license",
+ "external_noto-fonts_other_license",
],
- // large-scale-change unable to identify any license_text files
}
filegroup {
diff --git a/cjk/Android.bp b/cjk/Android.bp
index 1fc3d00..9d9b188 100644
--- a/cjk/Android.bp
+++ b/cjk/Android.bp
@@ -35,7 +35,7 @@
// See: http://go/android-license-faq
license {
name: "external_noto-fonts_cjk_license",
- visibility: [":__subpackages__"],
+ visibility: ["//external/noto-fonts:__subpackages__"],
license_kinds: [
"SPDX-license-identifier-Apache-2.0",
"SPDX-license-identifier-MIT",
diff --git a/other/Android.bp b/other/Android.bp
index f218904..b6ebb4e 100644
--- a/other/Android.bp
+++ b/other/Android.bp
@@ -35,7 +35,7 @@
// See: http://go/android-license-faq
license {
name: "external_noto-fonts_other_license",
- visibility: [":__subpackages__"],
+ visibility: ["//external/noto-fonts:__subpackages__"],
license_kinds: [
"SPDX-license-identifier-Apache-2.0",
"SPDX-license-identifier-MIT",
