diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-08 16:00:39 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-08 16:00:39 +0000 |
commit | 96732f39c01eb1149a8f9a88d4206cbc1ab08d46 (patch) | |
tree | 63183de6600d305f809bcfefe12d1c19944a986c | |
parent | 6e5ff9e5e1d23c5dfd3034fc8528f134bf675f92 (diff) | |
parent | f0ee77d72d73b4213c65fa59dc6ecb267873e221 (diff) | |
download | barlow-android12-mainline-tzdata2-release.tar.gz |
Snap for 8426163 from f0ee77d72d73b4213c65fa59dc6ecb267873e221 to mainline-tzdata2-releaseandroid-mainline-12.0.0_r112aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseaml_tz2_305400100
Change-Id: I373c5ad6a4ce44d7350d45dfff1ca73da930d3de
-rw-r--r-- | Android.bp | 60 | ||||
-rw-r--r-- | Barlow-Black.ttf (renamed from fonts/Barlow-Black.ttf) | bin | 105412 -> 105412 bytes | |||
-rw-r--r-- | Barlow-BlackItalic.ttf (renamed from fonts/Barlow-BlackItalic.ttf) | bin | 108748 -> 108748 bytes | |||
-rw-r--r-- | Barlow-BoldItalic.ttf (renamed from fonts/Barlow-BoldItalic.ttf) | bin | 106064 -> 106064 bytes | |||
-rw-r--r-- | Barlow-ExtraBold.ttf (renamed from fonts/Barlow-ExtraBold.ttf) | bin | 104376 -> 104376 bytes | |||
-rw-r--r-- | Barlow-ExtraBoldItalic.ttf (renamed from fonts/Barlow-ExtraBoldItalic.ttf) | bin | 107144 -> 107144 bytes | |||
-rw-r--r-- | Barlow-ExtraLight.ttf (renamed from fonts/Barlow-ExtraLight.ttf) | bin | 96608 -> 96608 bytes | |||
-rw-r--r-- | Barlow-ExtraLightItalic.ttf (renamed from fonts/Barlow-ExtraLightItalic.ttf) | bin | 102044 -> 102044 bytes | |||
-rw-r--r-- | Barlow-Italic.ttf (renamed from fonts/Barlow-Italic.ttf) | bin | 103780 -> 103780 bytes | |||
-rw-r--r-- | Barlow-Light.ttf (renamed from fonts/Barlow-Light.ttf) | bin | 97464 -> 97464 bytes | |||
-rw-r--r-- | Barlow-LightItalic.ttf (renamed from fonts/Barlow-LightItalic.ttf) | bin | 103064 -> 103064 bytes | |||
-rw-r--r-- | Barlow-MediumItalic.ttf (renamed from fonts/Barlow-MediumItalic.ttf) | bin | 103376 -> 103376 bytes | |||
-rw-r--r-- | Barlow-Regular.ttf (renamed from fonts/Barlow-Regular.ttf) | bin | 98340 -> 98340 bytes | |||
-rw-r--r-- | Barlow-SemiBold.ttf (renamed from fonts/Barlow-SemiBold.ttf) | bin | 102548 -> 102548 bytes | |||
-rw-r--r-- | Barlow-SemiBoldItalic.ttf (renamed from fonts/Barlow-SemiBoldItalic.ttf) | bin | 105904 -> 105904 bytes | |||
-rw-r--r-- | Barlow-Thin.ttf (renamed from fonts/Barlow-Thin.ttf) | bin | 95844 -> 95844 bytes | |||
-rw-r--r-- | Barlow-ThinItalic.ttf (renamed from fonts/Barlow-ThinItalic.ttf) | bin | 101352 -> 101352 bytes | |||
-rw-r--r-- | README | 1 | ||||
-rw-r--r-- | fonts.mk | 19 |
19 files changed, 0 insertions, 80 deletions
diff --git a/Android.bp b/Android.bp deleted file mode 100644 index ba1514a..0000000 --- a/Android.bp +++ /dev/null @@ -1,60 +0,0 @@ - -// 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, -} - diff --git a/fonts/Barlow-Black.ttf b/Barlow-Black.ttf Binary files differindex 4d9bb93..4d9bb93 100644 --- a/fonts/Barlow-Black.ttf +++ b/Barlow-Black.ttf diff --git a/fonts/Barlow-BlackItalic.ttf b/Barlow-BlackItalic.ttf Binary files differindex 1947969..1947969 100644 --- a/fonts/Barlow-BlackItalic.ttf +++ b/Barlow-BlackItalic.ttf diff --git a/fonts/Barlow-BoldItalic.ttf b/Barlow-BoldItalic.ttf Binary files differindex bc59eaf..bc59eaf 100644 --- a/fonts/Barlow-BoldItalic.ttf +++ b/Barlow-BoldItalic.ttf diff --git a/fonts/Barlow-ExtraBold.ttf b/Barlow-ExtraBold.ttf Binary files differindex 0da0383..0da0383 100644 --- a/fonts/Barlow-ExtraBold.ttf +++ b/Barlow-ExtraBold.ttf diff --git a/fonts/Barlow-ExtraBoldItalic.ttf b/Barlow-ExtraBoldItalic.ttf Binary files differindex a1f1612..a1f1612 100644 --- a/fonts/Barlow-ExtraBoldItalic.ttf +++ b/Barlow-ExtraBoldItalic.ttf diff --git a/fonts/Barlow-ExtraLight.ttf b/Barlow-ExtraLight.ttf Binary files differindex b70214d..b70214d 100644 --- a/fonts/Barlow-ExtraLight.ttf +++ b/Barlow-ExtraLight.ttf diff --git a/fonts/Barlow-ExtraLightItalic.ttf b/Barlow-ExtraLightItalic.ttf Binary files differindex a5f9351..a5f9351 100644 --- a/fonts/Barlow-ExtraLightItalic.ttf +++ b/Barlow-ExtraLightItalic.ttf diff --git a/fonts/Barlow-Italic.ttf b/Barlow-Italic.ttf Binary files differindex 987594e..987594e 100644 --- a/fonts/Barlow-Italic.ttf +++ b/Barlow-Italic.ttf diff --git a/fonts/Barlow-Light.ttf b/Barlow-Light.ttf Binary files differindex a6f71f2..a6f71f2 100644 --- a/fonts/Barlow-Light.ttf +++ b/Barlow-Light.ttf diff --git a/fonts/Barlow-LightItalic.ttf b/Barlow-LightItalic.ttf Binary files differindex 28b8a38..28b8a38 100644 --- a/fonts/Barlow-LightItalic.ttf +++ b/Barlow-LightItalic.ttf diff --git a/fonts/Barlow-MediumItalic.ttf b/Barlow-MediumItalic.ttf Binary files differindex 46e2a76..46e2a76 100644 --- a/fonts/Barlow-MediumItalic.ttf +++ b/Barlow-MediumItalic.ttf diff --git a/fonts/Barlow-Regular.ttf b/Barlow-Regular.ttf Binary files differindex 340f1c6..340f1c6 100644 --- a/fonts/Barlow-Regular.ttf +++ b/Barlow-Regular.ttf diff --git a/fonts/Barlow-SemiBold.ttf b/Barlow-SemiBold.ttf Binary files differindex e95527e..e95527e 100644 --- a/fonts/Barlow-SemiBold.ttf +++ b/Barlow-SemiBold.ttf diff --git a/fonts/Barlow-SemiBoldItalic.ttf b/Barlow-SemiBoldItalic.ttf Binary files differindex ba4f521..ba4f521 100644 --- a/fonts/Barlow-SemiBoldItalic.ttf +++ b/Barlow-SemiBoldItalic.ttf diff --git a/fonts/Barlow-Thin.ttf b/Barlow-Thin.ttf Binary files differindex d8882fe..d8882fe 100644 --- a/fonts/Barlow-Thin.ttf +++ b/Barlow-Thin.ttf diff --git a/fonts/Barlow-ThinItalic.ttf b/Barlow-ThinItalic.ttf Binary files differindex 869f1a3..869f1a3 100644 --- a/fonts/Barlow-ThinItalic.ttf +++ b/Barlow-ThinItalic.ttf @@ -1 +0,0 @@ -the ./fonts directory contain unused fonts. diff --git a/fonts.mk b/fonts.mk deleted file mode 100644 index 0da698d..0000000 --- a/fonts.mk +++ /dev/null @@ -1,19 +0,0 @@ - -# 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 |