From 5ef0ea1d84b21c916c9847d42cb3c86801b650a2 Mon Sep 17 00:00:00 2001 From: Kohsuke Yatoh Date: Fri, 25 Jun 2021 21:48:03 +0000 Subject: Remove dependency to real NotoColorEmoji.ttf. NotoColorEmoji.ttf has 'by-exception-only' license and should not have been depended by vts. This CL swaps it with a fake NotoColorEmoji.ttf font. testdata/NotoColorEmoji.ttx is based on cts/tests/tests/text/assets/fonts/samplefont.ttx Bug: 191914223 Test: atest UpdatableSystemFontTest Change-Id: If5f57471b492cae1eb35f6d4a4ac0054270b23a3 --- tests/UpdatableSystemFontTest/testdata/Android.bp | 7 + .../testdata/NotoColorEmoji.ttf | Bin 0 -> 1820 bytes .../testdata/NotoColorEmoji.ttx | 208 +++++++++++++++++++++ 3 files changed, 215 insertions(+) create mode 100644 tests/UpdatableSystemFontTest/testdata/NotoColorEmoji.ttf create mode 100644 tests/UpdatableSystemFontTest/testdata/NotoColorEmoji.ttx (limited to 'tests/UpdatableSystemFontTest/testdata') diff --git a/tests/UpdatableSystemFontTest/testdata/Android.bp b/tests/UpdatableSystemFontTest/testdata/Android.bp index 0f01be014d52..426464ea574e 100644 --- a/tests/UpdatableSystemFontTest/testdata/Android.bp +++ b/tests/UpdatableSystemFontTest/testdata/Android.bp @@ -21,6 +21,13 @@ package { default_applicable_licenses: ["frameworks_base_license"], } +// An existing module name is reused to avoid merge conflicts. +// TODO: fix the font and module name. +filegroup { + name: "NotoColorEmojiTtf", + srcs: ["NotoColorEmoji.ttf"], +} + filegroup { name: "UpdatableSystemFontTestKeyPem", srcs: ["UpdatableSystemFontTestKey.pem"], diff --git a/tests/UpdatableSystemFontTest/testdata/NotoColorEmoji.ttf b/tests/UpdatableSystemFontTest/testdata/NotoColorEmoji.ttf new file mode 100644 index 000000000000..f71f52cbaa2b Binary files /dev/null and b/tests/UpdatableSystemFontTest/testdata/NotoColorEmoji.ttf differ diff --git a/tests/UpdatableSystemFontTest/testdata/NotoColorEmoji.ttx b/tests/UpdatableSystemFontTest/testdata/NotoColorEmoji.ttx new file mode 100644 index 000000000000..6540c5898ec5 --- /dev/null +++ b/tests/UpdatableSystemFontTest/testdata/NotoColorEmoji.ttx @@ -0,0 +1,208 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copyright (C) 2021 The Android Open Source Project + + + Sample Font + + + Regular + + + Sample Font + + + + NotoColorEmoji + + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + http://www.apache.org/licenses/LICENSE-2.0 + + + + + + + + + + + + + + + + -- cgit v1.2.3-59-g8ed1b