diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-19 12:01:46 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-19 12:01:46 +0000 |
commit | 03d61bf28a159d392932af40a073d5ce4bd971ac (patch) | |
tree | 7c0b55f740eb26565827ded9156b95cc39e67764 | |
parent | f0ee77d72d73b4213c65fa59dc6ecb267873e221 (diff) | |
parent | 065803b5eed7bee20eb235a2cd572b3feaf0dfa0 (diff) | |
download | barlow-03d61bf28a159d392932af40a073d5ce4bd971ac.tar.gz |
Snap for 7474514 from 065803b5eed7bee20eb235a2cd572b3feaf0dfa0 to mainline-media-swcodec-releaseandroid-mainline-12.0.0_r91android-mainline-12.0.0_r75android-mainline-12.0.0_r47android-mainline-12.0.0_r30android-mainline-12.0.0_r13android-mainline-12.0.0_r120android-mainline-12.0.0_r105android12-mainline-media-swcodec-release
Change-Id: I4723b26e0cbf18f50f7c0dc266ad66d4f3d9c496
-rw-r--r-- | Android.bp | 60 | ||||
-rw-r--r-- | README | 1 | ||||
-rw-r--r-- | fonts.mk | 19 | ||||
-rw-r--r-- | fonts/Barlow-Black.ttf (renamed from Barlow-Black.ttf) | bin | 105412 -> 105412 bytes | |||
-rw-r--r-- | fonts/Barlow-BlackItalic.ttf (renamed from Barlow-BlackItalic.ttf) | bin | 108748 -> 108748 bytes | |||
-rw-r--r-- | fonts/Barlow-BoldItalic.ttf (renamed from Barlow-BoldItalic.ttf) | bin | 106064 -> 106064 bytes | |||
-rw-r--r-- | fonts/Barlow-ExtraBold.ttf (renamed from Barlow-ExtraBold.ttf) | bin | 104376 -> 104376 bytes | |||
-rw-r--r-- | fonts/Barlow-ExtraBoldItalic.ttf (renamed from Barlow-ExtraBoldItalic.ttf) | bin | 107144 -> 107144 bytes | |||
-rw-r--r-- | fonts/Barlow-ExtraLight.ttf (renamed from Barlow-ExtraLight.ttf) | bin | 96608 -> 96608 bytes | |||
-rw-r--r-- | fonts/Barlow-ExtraLightItalic.ttf (renamed from Barlow-ExtraLightItalic.ttf) | bin | 102044 -> 102044 bytes | |||
-rw-r--r-- | fonts/Barlow-Italic.ttf (renamed from Barlow-Italic.ttf) | bin | 103780 -> 103780 bytes | |||
-rw-r--r-- | fonts/Barlow-Light.ttf (renamed from Barlow-Light.ttf) | bin | 97464 -> 97464 bytes | |||
-rw-r--r-- | fonts/Barlow-LightItalic.ttf (renamed from Barlow-LightItalic.ttf) | bin | 103064 -> 103064 bytes | |||
-rw-r--r-- | fonts/Barlow-MediumItalic.ttf (renamed from Barlow-MediumItalic.ttf) | bin | 103376 -> 103376 bytes | |||
-rw-r--r-- | fonts/Barlow-Regular.ttf (renamed from Barlow-Regular.ttf) | bin | 98340 -> 98340 bytes | |||
-rw-r--r-- | fonts/Barlow-SemiBold.ttf (renamed from Barlow-SemiBold.ttf) | bin | 102548 -> 102548 bytes | |||
-rw-r--r-- | fonts/Barlow-SemiBoldItalic.ttf (renamed from Barlow-SemiBoldItalic.ttf) | bin | 105904 -> 105904 bytes | |||
-rw-r--r-- | fonts/Barlow-Thin.ttf (renamed from Barlow-Thin.ttf) | bin | 95844 -> 95844 bytes | |||
-rw-r--r-- | fonts/Barlow-ThinItalic.ttf (renamed from Barlow-ThinItalic.ttf) | bin | 101352 -> 101352 bytes |
19 files changed, 80 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..ba1514a --- /dev/null +++ b/Android.bp @@ -0,0 +1,60 @@ + +// Copyright (C) 2020 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// 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. + +// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS. PLEASE +// CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE +// DEPENDING ON IT IN YOUR PROJECT. *** +package { + default_applicable_licenses: ["external_google-fonts_barlow_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_google-fonts_barlow_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-MIT", + "SPDX-license-identifier-OFL", // by exception only + ], + license_text: [ + "LICENSE", + ], +} + +prebuilt_font { + name: "Barlow-Bold.ttf", + src: "Barlow-Bold.ttf", + product_specific: true, +} + +prebuilt_font { + name: "Barlow-Medium.ttf", + src: "Barlow-Medium.ttf", + product_specific: true, +} + @@ -0,0 +1 @@ +the ./fonts directory contain unused fonts. diff --git a/fonts.mk b/fonts.mk new file mode 100644 index 0000000..0da698d --- /dev/null +++ b/fonts.mk @@ -0,0 +1,19 @@ + +# Copyright (C) 2020 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http:#www.apache.org/licenses/LICENSE-2.0 +# +# 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. + +PRODUCT_PACKAGES := \ + Barlow-Bold.ttf \ + Barlow-Medium.ttf +
\ No newline at end of file diff --git a/Barlow-Black.ttf b/fonts/Barlow-Black.ttf Binary files differindex 4d9bb93..4d9bb93 100644 --- a/Barlow-Black.ttf +++ b/fonts/Barlow-Black.ttf diff --git a/Barlow-BlackItalic.ttf b/fonts/Barlow-BlackItalic.ttf Binary files differindex 1947969..1947969 100644 --- a/Barlow-BlackItalic.ttf +++ b/fonts/Barlow-BlackItalic.ttf diff --git a/Barlow-BoldItalic.ttf b/fonts/Barlow-BoldItalic.ttf Binary files differindex bc59eaf..bc59eaf 100644 --- a/Barlow-BoldItalic.ttf +++ b/fonts/Barlow-BoldItalic.ttf diff --git a/Barlow-ExtraBold.ttf b/fonts/Barlow-ExtraBold.ttf Binary files differindex 0da0383..0da0383 100644 --- a/Barlow-ExtraBold.ttf +++ b/fonts/Barlow-ExtraBold.ttf diff --git a/Barlow-ExtraBoldItalic.ttf b/fonts/Barlow-ExtraBoldItalic.ttf Binary files differindex a1f1612..a1f1612 100644 --- a/Barlow-ExtraBoldItalic.ttf +++ b/fonts/Barlow-ExtraBoldItalic.ttf diff --git a/Barlow-ExtraLight.ttf b/fonts/Barlow-ExtraLight.ttf Binary files differindex b70214d..b70214d 100644 --- a/Barlow-ExtraLight.ttf +++ b/fonts/Barlow-ExtraLight.ttf diff --git a/Barlow-ExtraLightItalic.ttf b/fonts/Barlow-ExtraLightItalic.ttf Binary files differindex a5f9351..a5f9351 100644 --- a/Barlow-ExtraLightItalic.ttf +++ b/fonts/Barlow-ExtraLightItalic.ttf diff --git a/Barlow-Italic.ttf b/fonts/Barlow-Italic.ttf Binary files differindex 987594e..987594e 100644 --- a/Barlow-Italic.ttf +++ b/fonts/Barlow-Italic.ttf diff --git a/Barlow-Light.ttf b/fonts/Barlow-Light.ttf Binary files differindex a6f71f2..a6f71f2 100644 --- a/Barlow-Light.ttf +++ b/fonts/Barlow-Light.ttf diff --git a/Barlow-LightItalic.ttf b/fonts/Barlow-LightItalic.ttf Binary files differindex 28b8a38..28b8a38 100644 --- a/Barlow-LightItalic.ttf +++ b/fonts/Barlow-LightItalic.ttf diff --git a/Barlow-MediumItalic.ttf b/fonts/Barlow-MediumItalic.ttf Binary files differindex 46e2a76..46e2a76 100644 --- a/Barlow-MediumItalic.ttf +++ b/fonts/Barlow-MediumItalic.ttf diff --git a/Barlow-Regular.ttf b/fonts/Barlow-Regular.ttf Binary files differindex 340f1c6..340f1c6 100644 --- a/Barlow-Regular.ttf +++ b/fonts/Barlow-Regular.ttf diff --git a/Barlow-SemiBold.ttf b/fonts/Barlow-SemiBold.ttf Binary files differindex e95527e..e95527e 100644 --- a/Barlow-SemiBold.ttf +++ b/fonts/Barlow-SemiBold.ttf diff --git a/Barlow-SemiBoldItalic.ttf b/fonts/Barlow-SemiBoldItalic.ttf Binary files differindex ba4f521..ba4f521 100644 --- a/Barlow-SemiBoldItalic.ttf +++ b/fonts/Barlow-SemiBoldItalic.ttf diff --git a/Barlow-Thin.ttf b/fonts/Barlow-Thin.ttf Binary files differindex d8882fe..d8882fe 100644 --- a/Barlow-Thin.ttf +++ b/fonts/Barlow-Thin.ttf diff --git a/Barlow-ThinItalic.ttf b/fonts/Barlow-ThinItalic.ttf Binary files differindex 869f1a3..869f1a3 100644 --- a/Barlow-ThinItalic.ttf +++ b/fonts/Barlow-ThinItalic.ttf |