diff options
author | Xin Li <delphij@google.com> | 2020-09-08 16:54:27 -0700 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2020-09-08 16:54:27 -0700 |
commit | e65062f1c3dca08b3e9add103dec3f4b0d471414 (patch) | |
tree | e58e0a980f006d63a609dff3cd6b4d83b9054545 | |
parent | f77b1a4f33a17a7e3512de6ae6515e2288c47da9 (diff) | |
parent | d610f22a75d357795af76c16c42c2767807f56ef (diff) | |
download | lato-e65062f1c3dca08b3e9add103dec3f4b0d471414.tar.gz |
Merge Android R
Bug: 168057903
Merged-In: I1b25ac53a5929017ba076e1b79d202d73a319d28
Change-Id: I106ef0086754e8f1d139b05346bdb507d0cb277d
-rw-r--r-- | Android.bp | 49 | ||||
-rw-r--r-- | Android.mk | 51 |
2 files changed, 49 insertions, 51 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..4963903 --- /dev/null +++ b/Android.bp @@ -0,0 +1,49 @@ +// Copyright (C) 2018 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. + +prebuilt_font { + name: "Lato-Regular.ttf", + src: "Lato-Regular.ttf", + product_specific: true, +} + +prebuilt_font { + name: "Lato-Italic.ttf", + src: "Lato-Italic.ttf", + product_specific: true, +} + +prebuilt_font { + name: "Lato-Medium.ttf", + src: "Lato-Medium.ttf", + product_specific: true, +} + +prebuilt_font { + name: "Lato-MediumItalic.ttf", + src: "Lato-MediumItalic.ttf", + product_specific: true, +} + +prebuilt_font { + name: "Lato-Bold.ttf", + src: "Lato-Bold.ttf", + product_specific: true, +} + +prebuilt_font { + name: "Lato-BoldItalic.ttf", + src: "Lato-BoldItalic.ttf", + product_specific: true, +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index b91df80..0000000 --- a/Android.mk +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright (C) 2018 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. - -# We have to use BUILD_PREBUILT instead of PRODUCT_COPY_FIES, -# to copy over the NOTICE file. - -LOCAL_PATH := $(call my-dir) - -ifneq ($(SMALLER_FONT_FOOTPRINT),true) - -include $(CLEAR_VARS) - -# Build the rest of font files as prebuilt. -# $(1): The source file name in LOCAL_PATH. -# It also serves as the module name and the dest file name. -define build-one-font-module -$(eval include $(CLEAR_VARS))\ -$(eval LOCAL_MODULE := $(1))\ -$(eval LOCAL_SRC_FILES := $(1))\ -$(eval LOCAL_MODULE_CLASS := ETC)\ -$(eval LOCAL_MODULE_TAGS := optional)\ -$(eval LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/fonts)\ -$(eval LOCAL_PRODUCT_MODULE := true) \ -$(eval include $(BUILD_PREBUILT)) -endef - -font_src_files := \ - Lato-Regular.ttf \ - Lato-Italic.ttf \ - Lato-Medium.ttf \ - Lato-MediumItalic.ttf \ - Lato-Bold.ttf \ - Lato-BoldItalic.ttf - -$(foreach f, $(font_src_files), $(call build-one-font-module, $(f))) - -build-one-font-module := -font_src_files := - -endif |